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

(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)

4 files changed, 16 insertions, 24 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/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
 }