Revbump to fix bugs with as-needed (#276873) and mixed libtool (#298069). Add blocker to mldonkey when examples useflag is enabled (#292998). Remove older ~arch ebuild.

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

6 files changed, 49 insertions, 15 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 0b1ec6c51387..2e5169413482 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,16 @@
 # 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.79 2010/02/27 14:20:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.80 2010/03/27 17:29:24 yngwin Exp $
+
+*rb_libtorrent-0.14.9-r1 (27 Mar 2010)
+
+  27 Mar 2010; Ben de Groot <yngwin@gentoo.org> rb_libtorrent-0.14.6.ebuild,
+  -rb_libtorrent-0.14.8-r2.ebuild, rb_libtorrent-0.14.9.ebuild,
+  +rb_libtorrent-0.14.9-r1.ebuild,
+  +files/rb_libtorrent-0.14.9-as-needed-fix.patch:
+  Revbump to fix bugs with as-needed (#276873) and mixed libtool (#298069).
+  Add blocker to mldonkey when examples useflag is enabled (#292998). Remove
+  older ~arch ebuild.
 
 *rb_libtorrent-0.14.9 (27 Feb 2010)
 
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index 2028b2670557..a3b1ad22bf30 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,11 +1,11 @@
 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
+AUX rb_libtorrent-0.14.9-as-needed-fix.patch 520 RMD160 e75c51c39acd3df37274d465296406d24328a8cf SHA1 2a73ad7edc9b98bd16466dde1112542336b9fd1a SHA256 04d0b833d109523764bbb410cebc59196a047bd72a8c6267a32bdf458a48877c
 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
 DIST libtorrent-rasterbar-0.14.9.tar.gz 1989956 RMD160 67f31b8dd98a3ead862a042ae226b23bdeb242a0 SHA1 cd7579100529cb2b0f0b4fcd2bee3d28c35b74c3 SHA256 08ea1eeea7d0fb8ed2ca2628c2e9c79d3bacc9f08011b4d9020a15dcd24e6ea3
-EBUILD rb_libtorrent-0.14.6.ebuild 1911 RMD160 99e33437d348984bb1d0533b8fcff51ddadf48db SHA1 fe6e2b0b9e8f5f13572cd199efa8f398a2eb82ac SHA256 27401568d0211873dc2f3aaa2703ab65e5053bb0abb09740f8ad9a97d92899bd
-EBUILD rb_libtorrent-0.14.8-r2.ebuild 2431 RMD160 1303ad578eda2143dc10422a8e0c448738033b0a SHA1 33a3dea923159508645f9f89ea8cbdf104621150 SHA256 b65c20d10112705c1be0c68a26f41f73bbd82c473e3bb858fef245da0db3498a
-EBUILD rb_libtorrent-0.14.9.ebuild 2445 RMD160 a0b06025fc9cbea94295e606ca6e84194ec514d4 SHA1 95c1bca2b5ac0b642c38ba458fd46339c1b41b41 SHA256 465b8af48d997b03b4b5c9aad30c86e22ff2ea696e31c6e839d66d9fac4ac7bf
-MISC ChangeLog 13560 RMD160 e59604f0b895fba06b5928c9d67d8053c7c7b52d SHA1 a78bbb47b4cf42e192cc64afa3cde6f63a19be30 SHA256 aee650384add01e0b8ef95e62963d6eca29c6ceeeb91aa149de373e11fe072da
+EBUILD rb_libtorrent-0.14.6.ebuild 1952 RMD160 54afc7e7c855ac65d9f350e181d23e6aadb823f6 SHA1 58f89daec74bbb55db9410ddd8cdee9186685abb SHA256 ba56af343fc44ac657a3882d7f526ec28e6ee5a99d855e4e6e98e9fecaa45940
+EBUILD rb_libtorrent-0.14.9-r1.ebuild 2451 RMD160 18bf07ebcdcea24b5901187c9557699035434357 SHA1 6480c0d0c41ff9de4558fc250c51d3c6905ea96a SHA256 b811ed26ec1e76af6fc54fc59498e2d9133331d52918da57bc332bb383d15bdc
+EBUILD rb_libtorrent-0.14.9.ebuild 2486 RMD160 e22fea447bfebfbd16c4290d90c0695edd3c408d SHA1 2b08af03ccd5a98b7ae64773f6c6264045971bd7 SHA256 b19603262b74cbaa83fa477e42a3d8d354dfdef3abf2c805c3731f4b3b3623f4
+MISC ChangeLog 14002 RMD160 5a2e7f4ebd466cc8553472d5385995c8d849e69b SHA1 47ffdf37f63e782cd821ce865865766f0ba5b530 SHA256 96f3c288cc8cb0ad444218add11694cb29a05d1bba3baa5e80437e3553bbb6c5
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch
new file mode 100644
index 000000000000..fc18070f5286
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.9-as-needed-fix.patch
@@ -0,0 +1,20 @@
+--- configure.in.orig	2010-02-19 08:03:57.000000000 +0100
++++ configure.in	2010-03-24 01:04:37.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;
+@@ -519,6 +518,9 @@
+ dnl Compile time options.
+ AC_SUBST(COMPILETIME_OPTIONS)
+ 
++dnl Check for clock_gettime
++AC_SEARCH_LIBS([clock_gettime],[rt])
++
+ AC_OUTPUT([Makefile
+ 	   src/Makefile
+ 	   include/Makefile
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 f6689ed5d5ee..31746e25ae68 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.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.6.ebuild,v 1.8 2010/01/09 20:36:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.6.ebuild,v 1.9 2010/03/27 17:29:24 yngwin Exp $
 
 EAPI="2"
 inherit autotools eutils flag-o-matic
@@ -23,7 +23,8 @@ RESTRICT="test"
 DEPEND="|| ( >=dev-libs/boost-1.35
 		( ~dev-libs/boost-1.34.1 dev-cpp/asio ) )
 	python? ( >=dev-libs/boost-1.35.0-r5[python] dev-lang/python:2.6[threads] )
-	sys-libs/zlib"
+	sys-libs/zlib
+	examples? ( !net-p2p/mldonkey )"  #292998
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r2.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.9-r1.ebuild
index 8f9a5e269f4c..c42c5dcd4af1 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.8-r2.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.14.9-r1.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-r2.ebuild,v 1.1 2010/01/15 23:33:53 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.9-r1.ebuild,v 1.1 2010/03/27 17:29:24 yngwin Exp $
 
 EAPI="2"
 inherit autotools eutils flag-o-matic versionator
@@ -22,13 +22,15 @@ RESTRICT="test"
 DEPEND="|| ( >=dev-libs/boost-1.35
 		( ~dev-libs/boost-1.34.1 dev-cpp/asio ) )
 	python? ( >=dev-libs/boost-1.35.0-r5[python] dev-lang/python:2.6[threads] )
-	sys-libs/zlib"
+	=sys-devel/libtool-2.2*
+	sys-libs/zlib
+	examples? ( !net-p2p/mldonkey )"  #292998
 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
+	epatch "${FILESDIR}"/${PN}-0.14.9-as-needed-fix.patch  #276873
+	epatch "${FILESDIR}"/${PN}-0.14.8-boost-detect.patch   #295474
+	rm ltmain.sh  #298069
 	eautoreconf
 }
 
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.9.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.9.ebuild
index d385ae4dd45c..65b7242f4746 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.9.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.14.9.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.9.ebuild,v 1.1 2010/02/27 14:20:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.9.ebuild,v 1.2 2010/03/27 17:29:24 yngwin Exp $
 
 EAPI="2"
 inherit autotools eutils flag-o-matic versionator
@@ -22,7 +22,8 @@ RESTRICT="test"
 DEPEND="|| ( >=dev-libs/boost-1.35
 		( ~dev-libs/boost-1.34.1 dev-cpp/asio ) )
 	python? ( >=dev-libs/boost-1.35.0-r5[python] dev-lang/python:2.6[threads] )
-	sys-libs/zlib"
+	sys-libs/zlib
+	examples? ( !net-p2p/mldonkey )"  #292998
 RDEPEND="${DEPEND}"
 
 src_prepare() {