Update boost m4 files from upstream svn.

(Portage version: 2.1.3.12)

3 files changed, 65 insertions, 6 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/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