Fix threads USE-flag check if boost >1.33, bug 174714

Package-Manager: portage-2.1.2.4

4 files changed, 23 insertions, 17 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index c1224ef3c6f0..de12c7644ed0 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.10 2007/04/13 21:12:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.11 2007/04/20 14:56:37 armin76 Exp $
+
+  20 Apr 2007; Raúl Porcel <armin76@gentoo.org> rb_libtorrent-0.11.ebuild,
+  rb_libtorrent-0.12_rc3.ebuild:
+  Fix threads USE-flag check if boost >1.33, bug 174714
 
 *rb_libtorrent-0.12_rc3 (13 Apr 2007)
 
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index 86b63b2b634e..dce16b7df915 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,17 +1,17 @@
 DIST libtorrent-0.11.tar.gz 1130537 RMD160 24e871a048fd085e24c60f1eaece6cd432d4d64b SHA1 166a2efc907b0b589ed3eb1e10c79c81c183d314 SHA256 f350e0af6b42c2cdb1f19008b00fe5f0b70236817f532a94bcb1e3ef6ebba0d7
 DIST libtorrent-0.12rc3.tar.gz 1180260 RMD160 42dc46c64a660c5258b96258e32da92abd1f8e68 SHA1 e69228c458aac9671cacc7e5af9739ed0a3fd866 SHA256 3d99e12edb01044ed50c51ae1f60f28dae43e28f7d52c179add0a8cc158d7740
-EBUILD rb_libtorrent-0.11.ebuild 1395 RMD160 59cde7f0138850fa4c3b42b61ba732714b183441 SHA1 7ead8fbd40beed73cac4087bea89fd835a69a3f2 SHA256 816466eba94ab520ed52f9543c3a0b548c300135b06af508c67605f360c41684
-MD5 ba36cc855eb2acbc4c4afc6c2f72ed5e rb_libtorrent-0.11.ebuild 1395
-RMD160 59cde7f0138850fa4c3b42b61ba732714b183441 rb_libtorrent-0.11.ebuild 1395
-SHA256 816466eba94ab520ed52f9543c3a0b548c300135b06af508c67605f360c41684 rb_libtorrent-0.11.ebuild 1395
-EBUILD rb_libtorrent-0.12_rc3.ebuild 1408 RMD160 b10daa9c25ff8204e694fb0630d4e7e3e6b35803 SHA1 c74f482854e34becd8562f873f8b14bb9704945c SHA256 a1c8c0017766b42f125a47a0f7364b093479e44aeb747d24c127a7dc27ecadac
-MD5 585d408ac1c89b7b1728fc2ae24034f1 rb_libtorrent-0.12_rc3.ebuild 1408
-RMD160 b10daa9c25ff8204e694fb0630d4e7e3e6b35803 rb_libtorrent-0.12_rc3.ebuild 1408
-SHA256 a1c8c0017766b42f125a47a0f7364b093479e44aeb747d24c127a7dc27ecadac rb_libtorrent-0.12_rc3.ebuild 1408
-MISC ChangeLog 1555 RMD160 998c1304cf8d574303c929413a2f4143c420a186 SHA1 930c599e47628b82d1baf23c851c2f9fffb77141 SHA256 2d7b59245408af19fb126eb31e092b69746ad5ed0c62cf457105049d2eb24064
-MD5 22e4aeea0a852d22690113b813bf6029 ChangeLog 1555
-RMD160 998c1304cf8d574303c929413a2f4143c420a186 ChangeLog 1555
-SHA256 2d7b59245408af19fb126eb31e092b69746ad5ed0c62cf457105049d2eb24064 ChangeLog 1555
+EBUILD rb_libtorrent-0.11.ebuild 1440 RMD160 1bb55ccad01598c4af35318e3f482f94ebecf02b SHA1 6220ac48583128f1d9783241b51e11bb2cb86f15 SHA256 5a0a034226abcec22deb67ea1ccdb4488fe1153c8a5d536dbc1a4942c72a2c56
+MD5 e15836546a8093066ed7acbc8a944f99 rb_libtorrent-0.11.ebuild 1440
+RMD160 1bb55ccad01598c4af35318e3f482f94ebecf02b rb_libtorrent-0.11.ebuild 1440
+SHA256 5a0a034226abcec22deb67ea1ccdb4488fe1153c8a5d536dbc1a4942c72a2c56 rb_libtorrent-0.11.ebuild 1440
+EBUILD rb_libtorrent-0.12_rc3.ebuild 1450 RMD160 f074edcd743cd237b6522c22e53d36bafd36649e SHA1 85c1213bb5bb2d1ca5d0dd06757bff5c001b2078 SHA256 f2c14aa5293022c42df4648e4053d7d32325a7f4c3293f56d0f6565ebadee683
+MD5 429ef39657462e1a57d4e6577cbba5e7 rb_libtorrent-0.12_rc3.ebuild 1450
+RMD160 f074edcd743cd237b6522c22e53d36bafd36649e rb_libtorrent-0.12_rc3.ebuild 1450
+SHA256 f2c14aa5293022c42df4648e4053d7d32325a7f4c3293f56d0f6565ebadee683 rb_libtorrent-0.12_rc3.ebuild 1450
+MISC ChangeLog 1721 RMD160 eb5404e1856282da8ae877a49a8491f58ea51f0c SHA1 39742b204f4fe9c5f7e883182226f79b6ca150af SHA256 44c072fe021036bdf43798f4115ae416cb43cc4366381fd3e2e3bd7c45a389d1
+MD5 ec3831a2cd9fa34e6afc42e7998c8492 ChangeLog 1721
+RMD160 eb5404e1856282da8ae877a49a8491f58ea51f0c ChangeLog 1721
+SHA256 44c072fe021036bdf43798f4115ae416cb43cc4366381fd3e2e3bd7c45a389d1 ChangeLog 1721
 MISC metadata.xml 222 RMD160 0dc4b04f31dcc89402f87c352327fe327b3cf31f SHA1 540337d5841f15b43186e5858f9e24032567de08 SHA256 713b9d1548682d5c1c3686a7b0711acf065a8fa4f386883ace90359d3dceb966
 MD5 5d4724517f1e88f93621f26ca38ec719 metadata.xml 222
 RMD160 0dc4b04f31dcc89402f87c352327fe327b3cf31f metadata.xml 222
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild
index a893b9d214ff..3bfcdf0c7102 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.11.ebuild,v 1.6 2007/03/18 22:19:52 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.11.ebuild,v 1.7 2007/04/20 14:56:37 armin76 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -24,7 +24,8 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	# We need boost built with threads
-	if ! built_with_use "dev-libs/boost" threads; then
+	if has_version "<dev-libs/boost-1.34" && \
+		! built_with_use "dev-libs/boost" threads; then
 		eerror "${PN} needs dev-libs/boost built with threads USE flag"
 		die "dev-libs/boost is built without threads USE flag"
 	fi
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.12_rc3.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.12_rc3.ebuild
index 07fbf4a48fca..4bb71fff1af8 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.12_rc3.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.12_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.12_rc3.ebuild,v 1.1 2007/04/13 21:12:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.12_rc3.ebuild,v 1.2 2007/04/20 14:56:37 armin76 Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -25,7 +25,8 @@ S="${WORKDIR}/${MY_P/_rc*/}"
 
 pkg_setup() {
 	# We need boost built with threads
-	if ! built_with_use "dev-libs/boost" threads; then
+	if has_version "<dev-libs/boost-1.34" && \
+		! built_with_use "dev-libs/boost" threads; then
 		eerror "${PN} needs dev-libs/boost built with threads USE flag"
 		die "dev-libs/boost is built without threads USE flag"
 	fi