Add boost detection patch to fix bug 295474

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 46 insertions, 4 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 8b0ca90257f0..8f3a179c959b 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/rb_libtorrent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.77 2010/01/14 16:02:17 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.78 2010/01/15 23:33:53 yngwin Exp $
+
+*rb_libtorrent-0.14.8-r2 (15 Jan 2010)
+
+  15 Jan 2010; Ben de Groot <yngwin@gentoo.org>
+  -rb_libtorrent-0.14.8-r1.ebuild, +rb_libtorrent-0.14.8-r2.ebuild,
+  +files/rb_libtorrent-0.14.8-boost-detect.patch:
+  Add new boost detection patch to really fix bug 295474
 
   14 Jan 2010; Ben de Groot <yngwin@gentoo.org>
   rb_libtorrent-0.14.8-r1.ebuild,
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index 189caaa326e2..502730f0a949 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,8 +1,9 @@
 AUX 0.14.6-configure-ldflags-fix.patch 364 RMD160 e637a5c5116892fc7b27d5245abb913c876d2781 SHA1 ef62a4a94119d219c1c93a61c449dafe9c550ecb SHA256 38582ae08e589848fd09cefe5295da74abc3a296c1f6954037caf4a6deef8933
 AUX rb_libtorrent-0.14.8-as-needed-fix.patch 357 RMD160 392f35d48dfd14cdd1d23edc0fb111ab954996dc SHA1 1fee86047249e29d82a4f2492dafd27d156a66ef SHA256 5d5dadd95ab8ab21b4c537d7abdda9f52926331ac658054de189fb92adbd0583
+AUX rb_libtorrent-0.14.8-boost-detect.patch 1969 RMD160 8d2c4b412a72b69978bef1f8c659941473657a79 SHA1 2ec58b038e9c1b896b1eeb42e646afbf4f9af5ea SHA256 63d782c54b18ff1fccc08345c4b9afe112b146fa41021da3d717ee313c862ec0
 DIST libtorrent-rasterbar-0.14.6.tar.gz 1995813 RMD160 454bb4550e1c8b782017214375c15add42c23a39 SHA1 2e3829a8c266c5a4ecd2d31bac223a1a60d644b9 SHA256 98540fe765163e6f22d53462694aee4e4213606179974470ebe1d8adc02b5f56
 DIST libtorrent-rasterbar-0.14.8.tar.gz 2000424 RMD160 5aefdd9aa072eb4b4b61149330f25d73254e607e SHA1 4eaaec1dd33924955c7f2c1209abab8aa81defd8 SHA256 1d9f00133ebd0d082308f1a92a59eafc0d718e3aeb3dadac10f1e1d3d2e01600
 EBUILD rb_libtorrent-0.14.6.ebuild 1911 RMD160 99e33437d348984bb1d0533b8fcff51ddadf48db SHA1 fe6e2b0b9e8f5f13572cd199efa8f398a2eb82ac SHA256 27401568d0211873dc2f3aaa2703ab65e5053bb0abb09740f8ad9a97d92899bd
-EBUILD rb_libtorrent-0.14.8-r1.ebuild 2365 RMD160 b3b04023791459b08e5916e10efae7c47c6eca8a SHA1 2604897d8400710e195b6183452c168260f5a2aa SHA256 7844e0d633a9a989fee40a70bf2d702886d923d76f5f5ef4f306764575f9576c
-MISC ChangeLog 13161 RMD160 652bdfb6e6aa1b5bfe8a1dfd316a4841ec739373 SHA1 92755b95162cde98be0c30f456a9b4eac7f5f0ee SHA256 d936c05c11bba602aa8016f90681935bc48e6f62304ceefb2231c27ad13c02e0
+EBUILD rb_libtorrent-0.14.8-r2.ebuild 2431 RMD160 1303ad578eda2143dc10422a8e0c448738033b0a SHA1 33a3dea923159508645f9f89ea8cbdf104621150 SHA256 b65c20d10112705c1be0c68a26f41f73bbd82c473e3bb858fef245da0db3498a
+MISC ChangeLog 13425 RMD160 9875b1d6d03a841dfdc4511491dc762c93adf716 SHA1 a6a2b7ccd678a57a5b60a910f28c7387ffd6d534 SHA256 67f45485d2f09d449044cef15629489893da8cefb44966e070b6a50d33d36404
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch
new file mode 100644
index 000000000000..6f557547a394
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.8-boost-detect.patch
@@ -0,0 +1,33 @@
+--- m4/ax_boost_base-fixed.m4.orig	2010-01-16 00:10:19.000000000 +0100
++++ m4/ax_boost_base-fixed.m4	2010-01-16 00:12:32.000000000 +0100
+@@ -89,7 +89,7 @@
+ 	dnl or if you install boost with RPM
+ 	if test "$ac_boost_path" != ""; then
+ 		BOOST_LDFLAGS="-L$ac_boost_path/lib"
+-		BOOST_CPPFLAGS="-I$ac_boost_path/include"
++		BOOST_CPPFLAGS="-I$ac_boost_path"
+ 	else
+ 		for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
+ 			if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
+--- bindings/python/setup.py.in.orig	2010-01-16 00:14:36.000000000 +0100
++++ bindings/python/setup.py.in	2010-01-16 00:15:15.000000000 +0100
+@@ -62,7 +62,7 @@
+ source_list = os.listdir(os.path.join(os.path.dirname(__file__), "src"))
+ source_list = [os.path.join("src", s) for s in source_list if s.endswith(".cpp")]
+ 
+-extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ @BOOST_SYSTEM_LIB@ @SSL_LDFLAGS@ @SSL_CXXFLAGS@'
++extra_cmd = '@COMPILETIME_OPTIONS@ @CPPFLAGS@ @LIBS@ @BOOST_LDFLAGS@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@ @BOOST_SYSTEM_LIB@ @SSL_LDFLAGS@ @SSL_CXXFLAGS@'
+ 
+ setup( name='python-libtorrent',
+ 	version='@PACKAGE_VERSION@',
+--- src/Makefile.am.orig	2010-01-16 00:16:08.000000000 +0100
++++ src/Makefile.am	2010-01-16 00:17:16.000000000 +0100
+@@ -108,7 +108,7 @@
+ $(top_srcdir)/include/libtorrent/version.hpp
+ 
+ 
+-libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO)
++libtorrent_rasterbar_la_LDFLAGS = $(LDFLAGS) -version-info $(INTERFACE_VERSION_INFO) @BOOST_LDFLAGS@
+ libtorrent_rasterbar_la_LIBADD = @ZLIB@ @BOOST_SYSTEM_LIB@ @BOOST_FILESYSTEM_LIB@ @BOOST_THREAD_LIB@ @PTHREAD_LIBS@ @SSL_LIBS@
+ 
+ AM_CXXFLAGS= -ftemplate-depth-100 -I$(top_srcdir)/include -I$(top_srcdir)/include/libtorrent @ZLIBINCL@ @DEBUGFLAGS@ @PTHREAD_CFLAGS@ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION @SSL_CXXFLAGS@
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r2.ebuild
index 59bdee36a320..8f9a5e269f4c 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r1.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r1.ebuild,v 1.2 2010/01/14 16:02:17 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r2.ebuild,v 1.1 2010/01/15 23:33:53 yngwin Exp $
 
 EAPI="2"
 inherit autotools eutils flag-o-matic versionator
@@ -28,6 +28,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	epatch "${FILESDIR}"/0.14.6-configure-ldflags-fix.patch  #290756
 	epatch "${FILESDIR}"/${P}-as-needed-fix.patch            #276873
+	epatch "${FILESDIR}"/${P}-boost-detect.patch             #295474
 	eautoreconf
 }