Update boost m4 files from upstream svn.

Package-Manager: portage-2.1.3.12

4 files changed, 77 insertions, 14 deletions

diff --git a/media-sound/bmpx/ChangeLog b/media-sound/bmpx/ChangeLog
index f253701d6c5f..8a7e7fd01308 100644
--- a/media-sound/bmpx/ChangeLog
+++ b/media-sound/bmpx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/bmpx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.68 2007/10/01 13:23:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/ChangeLog,v 1.69 2007/10/06 12:24:41 drac Exp $
+
+  06 Oct 2007; Samuli Suominen <drac@gentoo.org>
+  +files/bmpx-0.40.10-boost-m4.patch, bmpx-0.40.10.ebuild:
+  Update boost m4 files from upstream svn.
 
   01 Oct 2007; Samuli Suominen <drac@gentoo.org> bmpx-0.40.10.ebuild:
   Link against boost_*-mt instead of boost_*-mt-s which was causing text
diff --git a/media-sound/bmpx/Manifest b/media-sound/bmpx/Manifest
index 7c57ea044fa0..3e622a28837a 100644
--- a/media-sound/bmpx/Manifest
+++ b/media-sound/bmpx/Manifest
@@ -1,17 +1,21 @@
+AUX bmpx-0.40.10-boost-m4.patch 3750 RMD160 4358f56ccd100f98997c216a847f606eabf15b68 SHA1 867f93f75c260e3b7381a92a37a6408b9fa45bff SHA256 6724d32472726370d79ce67b9862459bacd1a721cbf38289addb2760dbb68855
+MD5 f564ad3daba77042f9f5a32ea1e76e06 files/bmpx-0.40.10-boost-m4.patch 3750
+RMD160 4358f56ccd100f98997c216a847f606eabf15b68 files/bmpx-0.40.10-boost-m4.patch 3750
+SHA256 6724d32472726370d79ce67b9862459bacd1a721cbf38289addb2760dbb68855 files/bmpx-0.40.10-boost-m4.patch 3750
 DIST bmpx-0.36.1.tar.bz2 2452879 RMD160 92acca3fd41fff77f1e8224b186ccfb6e7de6f2f SHA1 d1f798038add19b95f292e16cbfe88e91f02034a SHA256 3e9fa55b9ec5596132a1dabf117326faab33f6933995c3035aa9cc4afbf955c1
 DIST bmpx-0.40.10.tar.bz2 2197611 RMD160 59c399f7de9fad87c151bcd90c912957880aaa0e SHA1 93516775311d76b4b34efc88bb512c7f9ec564b1 SHA256 8f2f0c58efc53c28123662b122a017c3fee6aa49a4189b6d731117573e2c88c4
 EBUILD bmpx-0.36.1.ebuild 3095 RMD160 05bebfe8f602306a59af82ed8aae74629fe59693 SHA1 7a542210dcf55c6564aa09ea48d2f7e248a5ebe5 SHA256 d3c50d32bf480837cda160fd72601ae138616dde66c4990812fa772a3e3d60df
 MD5 6db0fc452d5b1727693f490700825e4e bmpx-0.36.1.ebuild 3095
 RMD160 05bebfe8f602306a59af82ed8aae74629fe59693 bmpx-0.36.1.ebuild 3095
 SHA256 d3c50d32bf480837cda160fd72601ae138616dde66c4990812fa772a3e3d60df bmpx-0.36.1.ebuild 3095
-EBUILD bmpx-0.40.10.ebuild 2551 RMD160 bad86f179267050ea9421a2aed1087ead8d20d31 SHA1 4234525f1b1991916724c70a85d98069b68c3641 SHA256 4c8bdf4d01ecd42efba3c3ba26ebb352af79df86b884ad6f98b9352cd593b796
-MD5 77102d242beaacb8b2412810ff19dfbe bmpx-0.40.10.ebuild 2551
-RMD160 bad86f179267050ea9421a2aed1087ead8d20d31 bmpx-0.40.10.ebuild 2551
-SHA256 4c8bdf4d01ecd42efba3c3ba26ebb352af79df86b884ad6f98b9352cd593b796 bmpx-0.40.10.ebuild 2551
-MISC ChangeLog 11752 RMD160 f92b716f33624e668e1902f8e24e02a994617a12 SHA1 eb662d460165fa2602338c1b3e21becf5d5ca39d SHA256 d69372595617b38e435ed5679641402e07a9bff803ce200d4aeff8ad3d14aa1c
-MD5 79601975dae328e2c8daba0c10b7681b ChangeLog 11752
-RMD160 f92b716f33624e668e1902f8e24e02a994617a12 ChangeLog 11752
-SHA256 d69372595617b38e435ed5679641402e07a9bff803ce200d4aeff8ad3d14aa1c ChangeLog 11752
+EBUILD bmpx-0.40.10.ebuild 2547 RMD160 9e669239535280234ef502405848bc06d9028fb1 SHA1 0994c644547c4d51642df82e4ec07b6eb6733fa9 SHA256 470b10edea0e755ad9093820828097a1d3b8a6ca5a547ab39edd57d256ca8613
+MD5 57cec12bb4dfec8b4aca5f7925be514a bmpx-0.40.10.ebuild 2547
+RMD160 9e669239535280234ef502405848bc06d9028fb1 bmpx-0.40.10.ebuild 2547
+SHA256 470b10edea0e755ad9093820828097a1d3b8a6ca5a547ab39edd57d256ca8613 bmpx-0.40.10.ebuild 2547
+MISC ChangeLog 11904 RMD160 dde07f7dc84d54a84c95d5a09e563e90b102597f SHA1 84d8b5d559c9e55907c462d5df3024f15486a593 SHA256 20d8a2fa9960538707d9c85a94f8b2c8c577a8041e360b4624ec10f123b2e000
+MD5 f1b731dcce75e3337a6609d15f37bf65 ChangeLog 11904
+RMD160 dde07f7dc84d54a84c95d5a09e563e90b102597f ChangeLog 11904
+SHA256 20d8a2fa9960538707d9c85a94f8b2c8c577a8041e360b4624ec10f123b2e000 ChangeLog 11904
 MISC metadata.xml 214 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f SHA1 ec7c7723b21b430e43c31acc7176045413af0225 SHA256 690c22b23be5f116a9ab2986b9fdae7b4f53788c4a8fafb369f3f636a3b619ba
 MD5 97f43390489104c86df538d5759098f0 metadata.xml 214
 RMD160 3ef8a9b331ffe9433ac2b885f83a985e0f89236f metadata.xml 214
diff --git a/media-sound/bmpx/bmpx-0.40.10.ebuild b/media-sound/bmpx/bmpx-0.40.10.ebuild
index 65adf6f76c0d..d1a27b379479 100644
--- a/media-sound/bmpx/bmpx-0.40.10.ebuild
+++ b/media-sound/bmpx/bmpx-0.40.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.40.10.ebuild,v 1.2 2007/10/01 13:23:31 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bmpx/bmpx-0.40.10.ebuild,v 1.3 2007/10/06 12:24:41 drac Exp $
 
-inherit fdo-mime gnome2-utils versionator
+inherit autotools eutils fdo-mime gnome2-utils versionator
 
 MY_PR="$(get_version_component_range 1-2 ${PV})"
 
@@ -48,11 +48,15 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xproto-7.0.10
 	doc? ( app-text/docbook-xsl-stylesheets	dev-libs/libxslt )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-boost-m4.patch
+	AT_M4DIR="m4" eautoreconf
+}
+
 src_compile() {
 	econf --with-tr1 --enable-ld-workaround \
-		--with-boost-regex=boost_regex-mt \
-		--with-boost-filesystem=boost_filesystem-mt \
-		--with-boost-iostreams=boost_iostreams-mt \
 		$(use_enable modplug) \
 		$(use_enable hal) \
 		$(use_enable sid) \
diff --git a/media-sound/bmpx/files/bmpx-0.40.10-boost-m4.patch b/media-sound/bmpx/files/bmpx-0.40.10-boost-m4.patch
new file mode 100644
index 000000000000..36ceca2fbfe6
--- /dev/null
+++ b/media-sound/bmpx/files/bmpx-0.40.10-boost-m4.patch
@@ -0,0 +1,51 @@
+diff -ur bmpx-0.40.10/m4/boost_filesystem.m4 bmpx-trunk/m4/boost_filesystem.m4
+--- bmpx-0.40.10/m4/boost_filesystem.m4	2007-09-27 18:01:46.000000000 +0300
++++ bmpx-trunk/m4/boost_filesystem.m4	2007-10-06 15:04:41.000000000 +0300
+@@ -78,11 +78,11 @@
+             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+             if test "x$ax_boost_user_filesystem_lib" = "x"; then
+                 ax_lib=""
+-                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.{so,a}* | sed 's,.*/,,' | sed -e 's;^libboost_filesystem\(.*\)\.so.*$;\1;' -e 's;^libboost_filesystem\(.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* | sed 's,.*/,,' | sed -e 's;^libboost_filesystem;;' -e 's;\(.*\)\.so.*$;\1;'` ; do
+                      ax_lib=${BN_BOOSTFILESYSTEM_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"])
++                                 [ax_lib=""; link_filesystem="no"])
+   				done
+                 # Some systems doesn t add extension to the libraries filename
+                 if test "x$ax_lib" = "x"; then
+diff -ur bmpx-0.40.10/m4/boost_iostreams.m4 bmpx-trunk/m4/boost_iostreams.m4
+--- bmpx-0.40.10/m4/boost_iostreams.m4	2007-09-27 18:01:46.000000000 +0300
++++ bmpx-trunk/m4/boost_iostreams.m4	2007-10-06 15:04:41.000000000 +0300
+@@ -81,11 +81,11 @@
+             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+             if test "x$ax_boost_user_iostreams_lib" = "x"; then
+                 ax_lib=""
+-                for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.{so,a}* | sed 's,.*/,,' | sed -e 's;^libboost_iostreams\(.*\)\.so.*$;\1;' -e 's;^libboost_iostreams\(.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* | sed 's,.*/,,' | sed -e 's;^libboost_iostreams;;' -e 's;\(.*\)\.so.*$;\1;'` ; do
+                      ax_lib=${BN_BOOST_IOSTREAMS_LIB}${libextension}
+ 				    AC_CHECK_LIB($ax_lib, exit,
+                                  [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
+-                                 [link_iostreams="no"])
++                                 [ax_lib=""; link_iostreams="no"])
+   				done
+                 # Some systems doesn t add extension to the libraries filename
+                 if test "x$ax_lib" = "x"; then
+diff -ur bmpx-0.40.10/m4/boost_regex.m4 bmpx-trunk/m4/boost_regex.m4
+--- bmpx-0.40.10/m4/boost_regex.m4	2007-09-27 18:01:46.000000000 +0300
++++ bmpx-trunk/m4/boost_regex.m4	2007-10-06 15:04:41.000000000 +0300
+@@ -77,11 +77,11 @@
+             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+             if test "x$ax_boost_user_regex_lib" = "x"; then
+                 ax_lib=""
+-                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.{so,a}* | sed 's,.*/,,' | sed -e 's;^libboost_regex\(.*\)\.so.*$;\1;' -e 's;^libboost_regex\(.*\)\.a*$;\1;'` ; do
++                for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* | sed 's,.*/,,' | sed -e 's;^libboost_regex;;' -e 's;\(.*\)\.so.*$;\1;'`; do
+                      ax_lib=${BN_BOOST_REGEX}${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"])
++                                 [ax_lib=""; link_regex="no"])
+   				done
+                 # Some systems doesn t add extension to the libraries filename
+                 if test "x$ax_lib" = "x"; then