Adding patch to fix problematic ldflags use in configure, bug 290756.

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

4 files changed, 25 insertions, 5 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index c2324bc81758..92f70fabb463 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/rb_libtorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.67 2009/10/27 10:39:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.68 2009/11/10 18:21:58 yngwin Exp $
+
+  10 Nov 2009; Ben de Groot <yngwin@gentoo.org>
+  +files/0.14.6-configure-ldflags-fix.patch, rb_libtorrent-0.14.6.ebuild:
+  Adding patch to fix problematic ldflags use in configure, bug 290756.
 
   27 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
   rb_libtorrent-0.14.6.ebuild:
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index f531c1c63f9c..9ee3e7f6844b 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,3 +1,4 @@
+AUX 0.14.6-configure-ldflags-fix.patch 364 RMD160 e637a5c5116892fc7b27d5245abb913c876d2781 SHA1 ef62a4a94119d219c1c93a61c449dafe9c550ecb SHA256 38582ae08e589848fd09cefe5295da74abc3a296c1f6954037caf4a6deef8933
 AUX rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch 710 RMD160 42b171fa60ed4e1af3d08dcc6b58a5fece888876 SHA1 7744d8f827bbf74b888e4297ed6d98d22752c4eb SHA256 41242b68d0e50329cd7056d57ab9681d7f9f9d368eb20b8026b4b291e9d9da10
 AUX rb_libtorrent-0.13-CVE-2009-1760.patch 2436 RMD160 0121d5e8e3c0f1a5c56f699bac317dd2a1f60fbf SHA1 8429c9be191af5a995f0e6a2f8a15761402cd74f SHA256 d0402cb71e97609e56f56376dc36d62531a244c40a267c7bdfd40cb728bbd16a
 AUX rb_libtorrent-0.13-boost-1.37.patch 519 RMD160 3126c253c5b330a99b93bcadb803145a751df248 SHA1 9745aee26b0ad9801c517086805ee064a3d82a95 SHA256 1f6d979590f8873717c78cdf5fe0214f4f7f8ccd5b0e417b1de233e6875367f8
@@ -9,6 +10,6 @@ DIST libtorrent-rasterbar-0.14.6.tar.gz 1995813 RMD160 454bb4550e1c8b78201721437
 EBUILD rb_libtorrent-0.13-r1.ebuild 1608 RMD160 6f8d1fa1e1516b167b3a3c3329d65ad164a26ff7 SHA1 3fbc89c53f0448656f22d5945c96572f087f97c5 SHA256 93cf7f8c6d96c737e7937c599848d7f2366387f3a110b6d9f09480f70296c51e
 EBUILD rb_libtorrent-0.14.4-r1.ebuild 1774 RMD160 7391833176f2bb4880f15fba467eeb40a86d7605 SHA1 cb9745e3e6ac1c102d17c6acaa5c1d9ac1f879ea SHA256 0135cbddf46cf0e29fca597dc73e93d3178e16d79d064f684cd2cbeedcbecd54
 EBUILD rb_libtorrent-0.14.5.ebuild 1771 RMD160 f239ad06e464c685eb085251b13b5c7d9c4501a1 SHA1 f7182d7adfe5dca9fc30eea5c8ea87e809559bba SHA256 09171fdbf03965cad1dd00b5af58489312bc4c2d15e8d45a2a9fc11900cbdb15
-EBUILD rb_libtorrent-0.14.6.ebuild 1773 RMD160 ab7c7fdfb3554164ba48940645382c2b81489305 SHA1 dcaba610bc4af4d8605d342ce106224fb5e85d24 SHA256 4761413c9f88abc95c3ab6f6a3dd10ef9ba0ed992e0ed43f1bf8fca620a2a104
-MISC ChangeLog 11567 RMD160 c0552f23a9c3ef546a9aa0bebf0a21d627f861b7 SHA1 af9441ca0b4dce73f2c161ca38ed5b84ac1cccaf SHA256 95b794a61d9e2877a66f82acbdfeb1aef9562469d97f90cd17822bbad65a517f
+EBUILD rb_libtorrent-0.14.6.ebuild 1878 RMD160 f001f8b03094faac36c1f6777097b5e2fd506945 SHA1 04acb70d592fe0445776d98517f2a60d6fc90817 SHA256 7953b3da881c6cc972b462d205edba91d0e42463cc8af8fdd1aa9fdeb2357659
+MISC ChangeLog 11759 RMD160 cf1a7a222c8357802f041027e44144f3333d6f58 SHA1 a9327430ff254f05e9eaa6e36e8824ca6d04cfd3 SHA256 99e6ed5d93861efe37c7ca68902285e8081b89529562047204652bb8a15bf5fc
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
diff --git a/net-libs/rb_libtorrent/files/0.14.6-configure-ldflags-fix.patch b/net-libs/rb_libtorrent/files/0.14.6-configure-ldflags-fix.patch
new file mode 100644
index 000000000000..9a3d27639648
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/0.14.6-configure-ldflags-fix.patch
@@ -0,0 +1,10 @@
+--- libtorrent-rasterbar-0.14.6/configure.in.orig	2009-11-10 19:04:06.000000000 +0100
++++ libtorrent-rasterbar-0.14.6/configure.in	2009-11-10 19:05:06.000000000 +0100
+@@ -157,7 +157,6 @@
+
+ dnl Apply boost config.
+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+-LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
+
+ if [[ "x$BUILD_TESTCLIENT" != "xno" ]]; then
+ 	CLIENT_TEST_BIN=client_test;
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.ebuild
index 4964458f5d65..96af94e97c86 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 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.6.ebuild,v 1.2 2009/10/27 10:39:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.ebuild,v 1.3 2009/11/10 18:21:58 yngwin Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic
+inherit autotools eutils flag-o-matic
 
 MY_P=${P/rb_/}
 MY_P=${MY_P/torrent/torrent-rasterbar}
@@ -26,6 +26,11 @@ DEPEND="!net-libs/libtorrent
 	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/0.14.6-configure-ldflags-fix.patch  #290756
+	eautoreconf
+}
+
 src_configure() {
 	append-ldflags -pthread