Remove built_with_use calls on boost by depending on new enough versions that always have threads.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

5 files changed, 23 insertions, 31 deletions

diff --git a/net-p2p/deluge/ChangeLog b/net-p2p/deluge/ChangeLog
index f825ad6a4266..e1d12b0de4fa 100644
--- a/net-p2p/deluge/ChangeLog
+++ b/net-p2p/deluge/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/deluge
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.118 2009/03/07 15:01:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/ChangeLog,v 1.119 2009/03/07 15:08:33 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> deluge-0.5.9.3.ebuild,
+  deluge-1.0.7-r1.ebuild, deluge-9999.ebuild:
+  Remove built_with_use calls on boost by depending on new enough versions
+  that always have threads.
 
   07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   -deluge-1.1.0-r1.ebuild, -deluge-1.1.1.ebuild, -deluge-1.1.2.ebuild:
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index e4d3e4a71399..2f4a7d9d5c5e 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -6,16 +6,16 @@ AUX deluged.init 2187 RMD160 6283e0f053c70c8ebbf19475db0da86313a027cc SHA1 408f2
 DIST deluge-0.5.9.3.tar.gz 2215212 RMD160 a18f93bacba20cfbe97272a83c5d11e62f2b418b SHA1 5f3ca7bca298c335f1600d7787b1478577afadd5 SHA256 30e62996cdcb689a5f552432b286f392fa2e855a768e279b3390c0cdd090f251
 DIST deluge-1.0.7.tar.gz 2577764 RMD160 b980ab82e67aabdbe180d32e8a1c5e175501fbd3 SHA1 c601a0af4fd5c2fdf7b50eb6af2ddafcff58bfaa SHA256 0ae866dd344003e179d67a4dff2d5bed2817f7b4ecadd3ca80635c9f9ed1cfcd
 DIST deluge-1.1.3.tar.bz2 2141719 RMD160 f6dab35651fe4d90e8866378676dc7fe976dfccf SHA1 23957e33a7c3644008245f7e83f14500a8e44655 SHA256 74e55ce87fdb3d546a9da2ca7ba7201545ce7f0e4a6f0fb58b1475743e871667
-EBUILD deluge-0.5.9.3.ebuild 1309 RMD160 7d3570e17e9dc7894675170808cde86725ee8ae0 SHA1 8646c2124392212f6b9e3d87c61242f14553fec9 SHA256 8109297079be09a677aa05c0207c5d7681e59893cfc3952e3233da478b3ef9e1
-EBUILD deluge-1.0.7-r1.ebuild 1714 RMD160 b4c3e4254cf572074805b08d9b1b810dc428a317 SHA1 c91156939a9a51b0db4e260f6bda48b580ef3b7d SHA256 e2c884680486a165c3c6127ac03b289e0dcd2e860a630f9c172096d633d48781
+EBUILD deluge-0.5.9.3.ebuild 1164 RMD160 1f5d5838172358dd4ee9196c708226e8770aa516 SHA1 3d3b7a5d926bf2ac01f0def1bbfe34c158e33c23 SHA256 087ec0a9e47d25137ce87944502e9c650d414ba56a0b790d57799195ecbffe2e
+EBUILD deluge-1.0.7-r1.ebuild 1536 RMD160 120014ec59c8004285b3f301f3ab5000f1487bab SHA1 a68d4385b9a59e9a564808e98d813f16b52ccc72 SHA256 7ed7ca5983081d6870bea90fcc4acfa00a2049cb05f271c6688cdfbeb45be594
 EBUILD deluge-1.1.3.ebuild 1581 RMD160 a7ad00d9f9333e1bf26d7df707791f0efcbc2486 SHA1 8c8d1d299b2494b6464838fb4d9137dbc7cc0800 SHA256 cfc21ab891b5122ae24a1d73cd8be0d0027170be6118d8b106d70b29982e5857
-EBUILD deluge-9999.ebuild 1815 RMD160 a38979d18fe8f904c27957b2ff3b08eeb1922896 SHA1 df72f041f9ec0ffab3942c74d699e470fc7386c6 SHA256 0d930018cdc830badd4f8384569e5399ecd3091a9327067585a400abb8fd6d76
-MISC ChangeLog 16646 RMD160 a224c84f41de4ef945f9b02d65487e77fb31007e SHA1 f9d69c13d8c10129812e94e827fddb04d8fc2e96 SHA256 9b62ded37f86045966585ab0267fce9446c8d15210d5b59a1cac87eadaee209a
+EBUILD deluge-9999.ebuild 1636 RMD160 c6ee9006e5c83168e1b2cc402f1c2acd8583bd73 SHA1 d20dd839dcb0dd13a2b89778e7781af9f58436e4 SHA256 5d65b8538744029adaf37c5ead9f46de958ea9ecbc35cf43254bdbfdd96cfdc4
+MISC ChangeLog 16872 RMD160 b13efbe8abe4288b335853572c9c4b146e1ddac5 SHA1 cfb200119193e121e0f9cde3173b2c62febf0d9d SHA256 dc64218c4cf1c210e50bb01e24915d1c0b5dcf45c52302435a23f3df2c7adf08
 MISC metadata.xml 222 RMD160 0dc4b04f31dcc89402f87c352327fe327b3cf31f SHA1 540337d5841f15b43186e5858f9e24032567de08 SHA256 713b9d1548682d5c1c3686a7b0711acf065a8fa4f386883ace90359d3dceb966
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmyjIkACgkQcxLzpIGCsLQJIACgiIZSTVCM4iijqfHMkM2BCfyi
-QaUAoJqc5tEUxcK/dpGWHqGtl/NL2XTV
-=hkFq
+iEYEARECAAYFAkmyjk4ACgkQcxLzpIGCsLQrSQCglmTluJu2k48zC0JttJTIcFaB
+ouYAnA6BnnVuyvp03nG9NwdqandRCiu7
+=UcbV
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/deluge/deluge-0.5.9.3.ebuild b/net-p2p/deluge/deluge-0.5.9.3.ebuild
index abe18601a885..4ffb581cc690 100644
--- a/net-p2p/deluge/deluge-0.5.9.3.ebuild
+++ b/net-p2p/deluge/deluge-0.5.9.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-0.5.9.3.ebuild,v 1.3 2008/09/03 17:21:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-0.5.9.3.ebuild,v 1.4 2009/03/07 15:08:33 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils distutils flag-o-matic
 
@@ -10,13 +12,13 @@ SRC_URI="http://download.deluge-torrent.org/source/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
+KEYWORDS="~x86-fbsd"
 IUSE="libnotify"
 
 S="${WORKDIR}"/${PN}-torrent-${PV}
 
 DEPEND=">=dev-lang/python-2.3
-	dev-libs/boost"
+	|| ( >=dev-libs/boost-1.34 ~dev-libs/boost-1.33.1[threads] )"
 RDEPEND="${DEPEND}
 	>=dev-python/pygtk-2
 	dev-python/pyxdg
@@ -25,11 +27,6 @@ RDEPEND="${DEPEND}
 	libnotify? ( dev-python/notify-python )"
 
 pkg_setup() {
-	if ! built_with_use --missing true "dev-libs/boost" threads; then
-		eerror "dev-libs/boost has to be built with threads USE-flag."
-		die "Missing threads USE-flag for dev-libs/boost"
-	fi
-
 	filter-ldflags -Wl,--as-needed
 }
 
diff --git a/net-p2p/deluge/deluge-1.0.7-r1.ebuild b/net-p2p/deluge/deluge-1.0.7-r1.ebuild
index 6147a423d1aa..ab137404c755 100644
--- a/net-p2p/deluge/deluge-1.0.7-r1.ebuild
+++ b/net-p2p/deluge/deluge-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.0.7-r1.ebuild,v 1.2 2009/01/18 17:11:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-1.0.7-r1.ebuild,v 1.3 2009/03/07 15:08:33 betelgeuse Exp $
 
 inherit eutils distutils flag-o-matic
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="gtk"
 
 DEPEND=">=dev-lang/python-2.4
-	dev-libs/boost
+	>=dev-libs/boost-1.34
 	dev-python/setuptools"
 RDEPEND="${DEPEND}
 	dev-python/pyxdg
@@ -27,11 +27,6 @@ RDEPEND="${DEPEND}
 	)"
 
 pkg_setup() {
-	if ! built_with_use --missing true "dev-libs/boost" threads; then
-		eerror "dev-libs/boost has to be built with threads USE-flag."
-		die "Missing threads USE-flag for dev-libs/boost"
-	fi
-
 	filter-ldflags -Wl,--as-needed
 }
 
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index fdb4b438c99e..70744b67cf73 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.17 2009/02/19 11:07:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/deluge/deluge-9999.ebuild,v 1.18 2009/03/07 15:08:33 betelgeuse Exp $
 
 inherit eutils distutils subversion flag-o-matic
 
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="gtk"
 
 DEPEND=">=dev-lang/python-2.5
-	dev-libs/boost
+	>=dev-libs/boost-1.34
 	dev-python/setuptools"
 RDEPEND="${DEPEND}
 	dev-python/pyxdg
@@ -34,11 +34,6 @@ RDEPEND="${DEPEND}
 	)"
 
 pkg_setup() {
-	if ! built_with_use --missing true "dev-libs/boost" threads; then
-		eerror "dev-libs/boost has to be built with threads USE-flag."
-		die "Missing threads USE-flag for dev-libs/boost"
-	fi
-
 	filter-ldflags -Wl,--as-needed
 }