Add ~x86-fbsd with adding patch for configure script. #418355

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 91 insertions, 14 deletions

diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog
index ad82823c673b..ffc18d3f6e0f 100644
--- a/media-video/mkvtoolnix/ChangeLog
+++ b/media-video/mkvtoolnix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mkvtoolnix
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.177 2012/09/20 15:15:49 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.178 2012/10/04 07:41:24 naota Exp $
+
+  04 Oct 2012;  <naota@gentoo.org>
+  +files/mkvtoolnix-5.8.0-boost-configure.patch, mkvtoolnix-5.8.0.ebuild:
+  Add ~x86-fbsd with adding patch for configure script. #418355
 
   20 Sep 2012; Christoph Junghans <ottxor@gentoo.org> mkvtoolnix-5.8.0.ebuild:
   added prefix support (bug #431308)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 2dfbe2dbf30d..251dec4647f8 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -2,23 +2,31 @@
 Hash: SHA256
 
 AUX mkvtoolnix-5.6.0-system-pugixml.patch 2504 SHA256 5bfca6cabe0974958a29ebfc46e95b7abc45543a5104eeaf120c7c0167aa2082 SHA512 d2ca71ea3b8f43bcba335cdf197e217718f36d51046b2466a205f3b71569fba47c155ae836b2a3123fe2c600a5af4d1dcff869205ab989083482567cd6def34c WHIRLPOOL fdce40b9e0f56dc67ea00409bb58fb37aaf21fb1ae9c9579ee0a4dbd638203c4267c8db1c81b6a70b81b788e91f6353c9bea6805a0767b5ecac18b37da12984e
+AUX mkvtoolnix-5.8.0-boost-configure.patch 5428 SHA256 060ef650d7cdfe0f6de0c614750a90105665b1321be3a59ef3e1fbec7a46bfa5 SHA512 8965f2e4116fa340753a1414a1bd285ea26a0f38f48cb80b1a57608426d9f24958afff35756135051098edaebfcf0fe07521b59bad4f5193fe6833b0d6e1cd5b WHIRLPOOL 2aab1692234fb364043c07e94f39efd94ae6c57d46b12814626ea3be7afe59d3d5f79de24905fa23aed4b1446ccbc2fdfa86eb69cd2e3c0c2a6298bf5cb841b5
 AUX mkvtoolnix-5.8.0-system-pugixml.patch 2435 SHA256 1e0111dc929dec691808db015c0eddd1bfcd312e5d3bd548957fb0b37ccd3c6e SHA512 a1d4c838527f581dda01d7702a8d42dd1e53bf00103408c4d62d09dc1e1a12bca6fd63d3f740e7d67c858d79d520c5948673f849cf3d8a9698a95666692c64cb WHIRLPOOL 0c12ed938f5ca61de04175982cf756f8da7462182b597eb5c4a2d0f6010d09755ccc4f419ebedb9b1743c4aeb7da0885fd87481791c57e54ed693bd4bb034cbc
 DIST mkvtoolnix-5.0.1.tar.bz2 2155095 SHA256 eecc48d17c0583b6b071e710bfe88ae09439bd99bb90c694a2fed0651bb08f19 SHA512 5ac0077bdef7426fc4f978bae5965f868dcc5b5a78982580a441b55390f900babd8863a215e5bfddbf0c93087c36d93e5a6cb473e1d9b156622b85f8baec8e91 WHIRLPOOL dc8e98d823f56e75f93a3603aab2b4374a91d273ffd7d4acad0ec248da99885802cb876b10707799a09a5be14acf5651d66a9190d78db9f241067cad20cf1434
 DIST mkvtoolnix-5.7.0.tar.bz2 3930983 SHA256 bfc947722c71130cb1896fa1d4ec39199dcb87fcf7e8e00ab36ae6c81d471f80 SHA512 0d2a219c1ad70319dd1305b4a35072420e750ad6ee998317445ad19a803c7f7d1f278afe837d93564f0952b98a65b494ab9702406fdc44ae58f8f25f12e93bb1 WHIRLPOOL 9979806e4af9867c933ea9754eff24c86e22f6ad512ebe5f42f73ab1c7dd8af1b9eca395225afd563a5037ee235c682f932f297cd23e0859d61e143349ded19d
 DIST mkvtoolnix-5.8.0.tar.bz2 4454971 SHA256 3c9ec7e4c035b82a35850c5ada98a29904edc44a0d1c9b900ed05d56e6274960 SHA512 c24850a8e5c68b06eec006028e7e53c92cff91e748c71bd3799f14e2299e23730043005ce3bd45271848c899df6a44c0f9bc84928c72ba886e8dd894c4b704f3 WHIRLPOOL 6e98c340bb80be55756f3d24272d712e2301f1eb8e314eababa59cf602cab7d27ea6f8ee3aa048db369abec1cfba8c5bdd2b679a0662741cea0c6cfdb5db7886
 EBUILD mkvtoolnix-5.0.1-r1.ebuild 1826 SHA256 82d52db276aa01eb04ba51dcf62bfb35b92d35e565568488601be74ceb63da9d SHA512 f173ff8c50635bf8731723e953ede5bfdd488775adb22012a8bb32a02b51d83692438afa82a383a42872d49623682468f4e1a4e3b0a6e9c2ee1dabbec7070b2a WHIRLPOOL 78fa80620ef232bb3829bdd7de7666edd37b80dececb032fd07eb4033e81344c0957c6c42f4c13b4f43662e3e17efec6d9b4a45db255e3e5c5774e08d7922aaf
 EBUILD mkvtoolnix-5.7.0.ebuild 2127 SHA256 ee87abf24a9408e06a21fe61897c4ea0283565573dc3cadb65e76b20224a97db SHA512 14c6864521117fa006356da4231bb720a8a64853999edfa8af2a51da1a51c0b65263037b68933595f680dc4462dfe5e7d898567b41ae87c7825d31f0acf318ac WHIRLPOOL 1867ce2c160bc007144ab5b630a62fa89f95a6246ebb2327022ba3717ce9a510fcbfca2854fcfeafc1357f7f239de4612b3377afaa1664548baf8b0c623cd459
-EBUILD mkvtoolnix-5.8.0.ebuild 2142 SHA256 f12b58678f75f05d67ab25b85c11caa47fc8a514b34c70bca5ef3b331573a0a8 SHA512 822f6ed36351a78a9a21769c7dbcd4b59b6bc7a75c653e94b29f4cf3621282105f8a093617b22ab19cf4a5c6fbecd4d2d4350a132fb108e61eca8def7b44094a WHIRLPOOL 0fe7e8b5e0dbb2a339a371891670f875eff525ed691d7b26b358db4aa345e70d9abf39cec3ee2c0a4585d8803dbe2850bccf41f2be14efc2a98ec480d940ade5
-MISC ChangeLog 26137 SHA256 6ede6b65fab972fad5e61eb9c77a511a5112b1dc5f97862da467fe54529ddbbd SHA512 d6db7c1ff89fb1324083139d4b3c653ed7ee8af7a06c08671d37cd269d09bfd2df11b0955ea34da0a26f04b91625deb3d9637c01c6bb2952eaeb8cfd2c8b95f2 WHIRLPOOL a8120dc93e04ac22332d36990048620f81287937eb75cf9eb4f830c9be653b8fa7cb3db4917b83407b7aba18e9365f614c6ce9ad004e34e1bab546b7dfa3898d
+EBUILD mkvtoolnix-5.8.0.ebuild 2219 SHA256 abf97d6f4e87a08b7804dfa6220e722d0431a94f979d0251e619658f1065903f SHA512 578597fd6d2330902d8137809065a89306c397a012e75efa2aca157a77e2f9f84859e9ecfee9a0ad968d08e97539f7e28a16a3603ecdaa1952fe39b8bbd0269e WHIRLPOOL 7aac6b91cba3a35301fa0dd4de35e6affae23527e44e4864b05cc0dc977986ab292e524b7871d4d3ec50c463cfbc4dab2141beb82b446ca27d0fc0cff62c76e7
+MISC ChangeLog 26310 SHA256 4ec1a071cdd28aa045367e0e0ded11726f0ce63d99aafe44367cb794b5b369d1 SHA512 0d183f0a8a53121d81a2217762c7e746e94b4a04cc8c8f3d7b416720a7b4235d4b9cca3b59fdd4607c90fc064105ea76cb06fa584232d2cfd179ef6ef3323b08 WHIRLPOOL 8668c96a75bad3bf653fda956c93ba9f9757a0bbcbe2a710b9bc574ea756a948769e1a51dbe83bcbab4a076028d001ba7ed5f13ce16d4282455eeaa333090c36
+MISC Manifest.rej 5219 SHA256 c65c5c3d03b644d341fa24e38d248004c16ac751fe5b3206272694f8ae79d325 SHA512 05ade973b23472c9cf93c4e8ada86738e43b9f70e173e29fb7e9015c260bb162588570e2082b2c5be952fe73bcab4d4ae3dd3ef79264c929996960e15debf48d WHIRLPOOL d82f08008c4b74dcbc6085464ab6a046b57f1a65f238747f85836fe847839ba66516f0cd352c8116cc0ac6fd43abb43f062dfc5a5a3cd831e7d0ae1ec52c3c2c
 MISC metadata.xml 233 SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a SHA512 89b49780f54132f4768196e82bc7c534157728f4ec8db2a2ce9c2748859d136a7622d5239848010ab72aea19ebfb0eea3d8563737b5b888a09f56134e3424c87 WHIRLPOOL 86f0c2c9825ec94c962485b82d678e412401eb73e74d030cdc4308e015880b0a0e77bf5ea671f0920d5e9e91b5c732c13bdb5903fbb6d0485dfad9026d554e6c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQWzMrAAoJEOeBhlrCAAWG4BEIAIoyLm0bNUHIALisy3ps2H4m
-Qk6nnrikkMAbnAlXxsylN3+jNOUgMWYCgZFxEcH/REAHp57kq1XTlVEKSlWZ1q2o
-6ouE5onGgH77J4SuXZJ3qeMtV9EKCJ2o8m1Zq6dlYMJV6jR2awJdVvWMNO/qiG0H
-5XODiy43AeiTW8Tsxce7GVM4YqzTa85oqeG9X3jaBL1lcPonw/qZQJGkTeyZiA1F
-VeLtwH4zOE8xHjfVylxvpkbABvSZ44Xgoc3KwT2QF7hcw9hReHK220+Ch5P3zVcJ
-+szcZ35HkoXqs3dWGV2ZSRaKM6RxuAyMte28YX6wwhpSkMkLEZqM4snd6HRUoaw=
-=FN/e
+iQIcBAEBCAAGBQJQbT3SAAoJEDYO1FT4VRUUIj4P/iDqYn/yrhyoRtW6umbu1XCV
+svmb5JF5mVnJB2ZO9qcQHQGRW255RLB5EHVLKi6u2qtw6S8v1KLeYmz+oZzY4UbV
+QEWQj9xriVczIJn1LUFZDgnmAXrakvvRD6pxTFQMIA9xhOhYBjFAR0ByTvYWO8f4
+b4TTgvAzRedSXbnpjdw1MwbwCoNcg6aA3gqlOgltdyRLYGeSvjWcRMbDM8utjJHK
+f15eOP60qKb2b9TZc8WkUCZ5w0mAJEisFaw//bwfCvFRWX78kTio9KY9HTtx3ZIH
+yYbNDpTXw/YZN+geoEAKVB813RjugzdyIZMoImI08OfcSYVmD/V8iI8G6aLIbKr3
+wSC9AdZ/kYT+BXqJDlkEi1k8bGL9g1KmLh8crtr1XvQuXMCcstBI2AVEM6JpP7WE
+cAkXr0njBZkoVu/LGHUVdlG5nth+XjrRja/TKKVEN+Gipu4+evv7a8/diKm0hDvy
+4IpzjSA+aJAe60VFOr4dksVYpzq6bUwGq+AuRq9V4n7CUqfTNz6rchk4cCeU+v3s
+5fPrvQOhBS867bCzIUEtCuBjXlXfyFaDGXJotzOgnxrpmlayPsfoDZ9Fk1Bqc+Eb
+k6gluFjGszErWpB0RNAkeHXIqO2IGfCKMuCaA04Zdc5n4WUEfzDiPF4VaglCONo+
+DCAhaDO/nwziCuBPs6A7
+=HJIM
 -----END PGP SIGNATURE-----
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
new file mode 100644
index 000000000000..72b94b9688c8
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-5.8.0-boost-configure.patch
@@ -0,0 +1,63 @@
+diff --git a/ac/ax_boost_filesystem.m4 b/ac/ax_boost_filesystem.m4
+index 97c4ad0..87b94a8 100644
+--- a/ac/ax_boost_filesystem.m4
++++ b/ac/ax_boost_filesystem.m4
+@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
+ 			AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available])
+             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+             if test "x$ax_boost_user_filesystem_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_filesystem.*\)\.so.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_filesystem.*\)\.a.*$,\1,'`; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+                                  [link_filesystem="no"],[$BOOST_SYSTEM_LIB])
+ 				done
+                 if test "x$link_filesystem" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
+diff --git a/ac/ax_boost_regex.m4 b/ac/ax_boost_regex.m4
+index ffd537f..2cef64f 100644
+--- a/ac/ax_boost_regex.m4
++++ b/ac/ax_boost_regex.m4
+@@ -75,14 +75,14 @@ AC_DEFUN([AX_BOOST_REGEX],
+ 			AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available])
+             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+             if test "x$ax_boost_user_regex_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_regex.*\)\.so.*$,\1,' -e 's,^lib\(boost_regex.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_regex.*\)\.a.*$,\1,'`; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+                                  [link_regex="no"])
+ 				done
+                 if test "x$link_regex" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_regex*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break],
+diff --git a/ac/ax_boost_system.m4 b/ac/ax_boost_system.m4
+index b0685b9..a71907b 100644
+--- a/ac/ax_boost_system.m4
++++ b/ac/ax_boost_system.m4
+@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
+ 
+ 			LDFLAGS_SAVE=$LDFLAGS
+             if test "x$ax_boost_user_system_lib" = "x"; then
+-                for libextension in `ls $BOOSTLIBDIR/libboost_system*.{so,dylib,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's,^lib\(boost_system.*\)\.so.*$,\1,' -e 's,^lib\(boost_system.*\)\.dylib.*$,\1,' -e 's,^lib\(boost_system.*\)\.a.*$,\1,'`; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
+                                  [link_system="no"])
+ 				done
+                 if test "x$link_system" != "xyes"; then
+-                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;'` ; do
+                      ax_lib=${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
diff --git a/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild
index f000891d9d80..049434972e96 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild,v 1.3 2012/09/20 15:15:49 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-5.8.0.ebuild,v 1.4 2012/10/04 07:41:24 naota Exp $
 
 EAPI=4
-inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing
+inherit eutils multilib toolchain-funcs versionator wxwidgets multiprocessing autotools
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
 HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix"
@@ -11,7 +11,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="bzip2 debug lzo pch qt4 wxwidgets"
 
 RDEPEND="
@@ -49,7 +49,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-system-pugixml.patch
+	epatch "${FILESDIR}"/${P}-system-pugixml.patch \
+		"${FILESDIR}"/${P}-boost-configure.patch
+	eautoreconf
 }
 
 src_configure() {