Depend on a newer boost so that we always have threads support.

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

4 files changed, 17 insertions, 33 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 97ed4f945481..9d4a9a03a2f9 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.52 2009/03/07 15:40:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.53 2009/03/07 16:13:27 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
+  qbittorrent-1.0.0.ebuild, qbittorrent-1.2.1.ebuild,
+  qbittorrent-1.3.1.ebuild:
+  Depend on a newer boost so that we always have threads support.
 
   07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org>
   -qbittorrent-1.1.4.ebuild:
diff --git a/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild b/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
index 265bc9c923f6..cd720e0a96a7 100644
--- a/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild
@@ -1,6 +1,6 @@
-# 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/qbittorrent/qbittorrent-1.0.0.ebuild,v 1.5 2008/08/05 16:39:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.0.0.ebuild,v 1.6 2009/03/07 16:13:27 betelgeuse Exp $
 
 EAPI="1"
 
@@ -18,22 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
+# boost version so that we always have threads support
 DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )
 	>=net-libs/rb_libtorrent-0.13
-	dev-libs/boost
+	>=dev-libs/boost-1.34.1
 	net-misc/curl
 	dev-cpp/commoncpp2"
 RDEPEND="${DEPEND}
 	>=dev-lang/python-2.3"
 
-pkg_setup() {
-	# We need boost built with threads
-	if ! built_with_use --missing true "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
-}
-
 src_compile() {
 	# econf fails, since this uses qconf
 	./configure --prefix=/usr --qtdir=/usr \
diff --git a/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild b/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild
index ddd851c7edee..2992f8c15264 100644
--- a/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# 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/qbittorrent/qbittorrent-1.2.1.ebuild,v 1.1 2008/11/10 10:09:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.2.1.ebuild,v 1.2 2009/03/07 16:13:27 betelgeuse Exp $
 
 EAPI="1"
 
@@ -18,22 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# boost version so that we always have threads support
 DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3*:4 )
 	>=net-libs/rb_libtorrent-0.13.1
-	dev-libs/boost
+	>=dev-libs/boost-1.34.1
 	net-misc/curl
 	dev-cpp/commoncpp2"
 RDEPEND="${DEPEND}
 	>=dev-lang/python-2.3"
 
-pkg_setup() {
-	# We need boost built with threads
-	if ! built_with_use --missing true "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
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
diff --git a/net-p2p/qbittorrent/qbittorrent-1.3.1.ebuild b/net-p2p/qbittorrent/qbittorrent-1.3.1.ebuild
index f5029873244c..bf56d58c3db0 100644
--- a/net-p2p/qbittorrent/qbittorrent-1.3.1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-1.3.1.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/qbittorrent/qbittorrent-1.3.1.ebuild,v 1.1 2009/03/04 15:58:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-1.3.1.ebuild,v 1.2 2009/03/07 16:13:27 betelgeuse Exp $
 
 EAPI="1"
 
@@ -18,22 +18,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+# boost version so that we always have thread support
 DEPEND="|| ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* )
 	>=net-libs/rb_libtorrent-0.14.1
-	dev-libs/boost
+	>=dev-libs/boost-1.34.1
 	net-misc/curl
 	dev-cpp/commoncpp2"
 RDEPEND="${DEPEND}
 	>=dev-lang/python-2.3"
 
-pkg_setup() {
-	# We need boost built with threads
-	if ! built_with_use --missing true "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
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"