Remove old versions. Add slotted boost detection to fix bug #309415.

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

6 files changed, 19 insertions, 158 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 2b1bc53e65d7..d541e51749cb 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.76 2010/03/25 18:12:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.77 2010/03/26 21:46:04 yngwin Exp $
+
+  26 Mar 2010; Ben de Groot <yngwin@gentoo.org> -qbittorrent-1.5.5.ebuild,
+  -qbittorrent-2.1.6.ebuild, -qbittorrent-2.2.0.ebuild,
+  qbittorrent-2.2.2.ebuild:
+  Remove old versions. Add slotted boost detection to fix bug #309415.
 
 *qbittorrent-2.2.2 (25 Mar 2010)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index af3a1f602bec..1f00b36b8adc 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,12 +1,6 @@
-DIST qbittorrent-1.5.5.tar.gz 1745594 RMD160 5a30b76af9f57e53dbf216429a95b60df6f25932 SHA1 001cc430b0b469e6ba2c494caf422f3f4308a5a5 SHA256 9839740d73a41febeac20acc7537fb6bb2b8fa31d4a6255d02b24b1780ee56b8
 DIST qbittorrent-2.1.2.tar.gz 2373105 RMD160 f358633b2f380f24ecfa8804b506e1539061fd51 SHA1 e5c21c4c9e4f001efcdf34be62909d942da81ce7 SHA256 f58e4e56f5c8657f8d1e24611a52545ad56b3e2a821cdc48e1520c26f9e35dc7
-DIST qbittorrent-2.1.6.tar.gz 2416012 RMD160 4a66d7b864dfb905a47e42ba8dd56a16ab690497 SHA1 bd0929993ab42dbc21f8ee91d58283ffa1235635 SHA256 a4746db8d317476f77d7fe13d3fe2df7794d083fbc35bfdc28ca102a320744a2
-DIST qbittorrent-2.2.0.tar.gz 2493432 RMD160 4f31c91a2adadf62349b6ee97f0a6c30307cd8d3 SHA1 803e691bd3eb1dc75192f377c3e53aa1842ecc3e SHA256 fbaffbbdd88cecea4fa0199bbf15b95257fb992a872140586c43728f16b55729
 DIST qbittorrent-2.2.2.tar.gz 2498865 RMD160 c9ff7b7ac51ab1f0bf439205a69cae99a44ab27d SHA1 cb12f934f6c61c78f71b7afce065442d77e6dc9c SHA256 9750ae4c384f0b283f9185722fdb1206148438132c5f44b094c6b0e697c5711d
-EBUILD qbittorrent-1.5.5.ebuild 1104 RMD160 d7cfce5bcbad37428f174d77e4b4336e71b9b3ef SHA1 b5e72a533d23a6da7c39276296b30a43ae9439fe SHA256 abfc9e1427a71bec0e5f9a90ac1a50d8312ae425cd417eedc7f01bded7a06d41
 EBUILD qbittorrent-2.1.2.ebuild 1336 RMD160 a8f555604c275ef1e588734cc23312d613c9b1d9 SHA1 9e6f67955d30db965e27db82836e03f64ba6eb0b SHA256 5c5b4b125951196e6208cd46c38949ccfc59ab146eb1a9a495ec0035959d9f6b
-EBUILD qbittorrent-2.1.6.ebuild 1333 RMD160 de8330b1110496454ad7da14eab03897b9c4d041 SHA1 29bf4b477459bd220237af3dfad17ef3a19daf90 SHA256 52015f7f865cec8b96223478c06e34446b3d5cb8f1a8313df179ae13cf9db50b
-EBUILD qbittorrent-2.2.0.ebuild 1334 RMD160 43a2fff9fdf09e1a3bb5f724005b0924dbd52926 SHA1 127a9455f87eff5f83705f9f75b03932ecf4a843 SHA256 774f60ae23d291c6b703457002b20154831594105e9d40ba2b01fd3cc2f31428
-EBUILD qbittorrent-2.2.2.ebuild 1334 RMD160 c8940dd3667e0c47c1f3a15bca2a565e8376d2f0 SHA1 1af81d1e2532fc8113a4b94827a6beecb3355ab9 SHA256 f0d4f662f35c2a9912a4ac484704fd55486cb45cb8f679e2ea784cc658e8adb5
-MISC ChangeLog 12749 RMD160 a84ce27c102a38520a7df8b3c4bd9e08522ea7ec SHA1 672867b176cac1d0fde795cab01dcadc49aa1262 SHA256 da42d9e2cc5960835bf203dccfdeebf7b6230a4552682ad29d9d5b164b642898
+EBUILD qbittorrent-2.2.2.ebuild 1745 RMD160 682b30b7675c31588bbdc2db9e8aa1ac250e1ba9 SHA1 63705dac7f27bbbc4bf67aad3de6ec14a5b4b40a SHA256 6289e9e8790b6f96d136804bc74587b7ed0a8a7191276c05625ef3cbd88a3cf5
+MISC ChangeLog 12980 RMD160 07925d9ec74d89b73da14083a47dcd63c7af5ecc SHA1 4660e6ff9eeded11125b795eef4007a664507897 SHA256 8bd2f07208bcdc26383c2d5be3069e23f32d67ca4e1e86c748585100c17c71de
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
diff --git a/net-p2p/qbittorrent/qbittorrent-1.5.5.ebuild b/net-p2p/qbittorrent/qbittorrent-1.5.5.ebuild
deleted file mode 100644
index 1bc59edcd632..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-1.5.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.5.5.ebuild,v 1.3 2009/12/28 21:29:42 maekke Exp $
-
-EAPI="2"
-inherit eutils qt4 multilib
-
-MY_P="${P/_/}"
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="http://www.qbittorrent.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# boost version so that we always have thread support
-DEPEND=" x11-libs/qt-gui:4
-	>=net-libs/rb_libtorrent-0.14.6
-	>=dev-libs/boost-1.34.1
-	dev-libs/zziplib
-	net-misc/curl
-	dev-cpp/commoncpp2"
-RDEPEND="${DEPEND}
-	>=dev-lang/python-2.3"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Respect LDFLAGS
-	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-	qt4_src_prepare
-}
-
-src_configure() {
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr || die "configure failed"
-	eqmake4
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "emake install failed"
-	dodoc AUTHORS Changelog NEWS README TODO
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.1.6.ebuild b/net-p2p/qbittorrent/qbittorrent-2.1.6.ebuild
deleted file mode 100644
index 57da26964624..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-2.1.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.1.6.ebuild,v 1.1 2010/03/07 21:50:36 wired Exp $
-
-EAPI="2"
-inherit confutils qt4-r2
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="http://www.qbittorrent.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+X geoip libnotify"
-
-# boost version so that we always have thread support
-CDEPEND="net-libs/rb_libtorrent
-	x11-libs/qt-core:4
-	X? ( x11-libs/qt-gui:4
-		libnotify? ( x11-libs/qt-gui:4[glib] ) )
-	>=dev-libs/boost-1.34.1"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${CDEPEND}
-	>=dev-lang/python-2.3
-	geoip? ( dev-libs/geoip )
-	libnotify? ( x11-libs/libnotify )"
-
-DOCS="AUTHORS Changelog NEWS README TODO"
-
-pkg_setup() {
-	confutils_use_depend_all libnotify X
-}
-
-src_prepare() {
-	# Respect LDFLAGS
-	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use X         || myconf+=" --disable-gui"
-	use geoip     || myconf+=" --disable-geoip-database"
-	use libnotify || myconf+=" --disable-libnotify"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr ${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.0.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.0.ebuild
deleted file mode 100644
index c381072ef5a8..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-2.2.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.0.ebuild,v 1.1 2010/03/18 20:41:28 yngwin Exp $
-
-EAPI="2"
-inherit confutils qt4-r2
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="http://www.qbittorrent.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+X geoip libnotify"
-
-# boost version so that we always have thread support
-CDEPEND="net-libs/rb_libtorrent
-	x11-libs/qt-core:4
-	X? ( x11-libs/qt-gui:4
-		libnotify? ( x11-libs/qt-gui:4[glib] ) )
-	>=dev-libs/boost-1.34.1"
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${CDEPEND}
-	>=dev-lang/python-2.3
-	geoip? ( dev-libs/geoip )
-	libnotify? ( x11-libs/libnotify )"
-
-DOCS="AUTHORS Changelog NEWS README TODO"
-
-pkg_setup() {
-	confutils_use_depend_all libnotify X
-}
-
-src_prepare() {
-	# Respect LDFLAGS
-	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-	qt4-r2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	use X         || myconf+=" --disable-gui"
-	use geoip     || myconf+=" --disable-geoip-database"
-	use libnotify || myconf+=" --disable-libnotify"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr ${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild
index 7734ca277ba0..d3c479100e75 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild,v 1.1 2010/03/25 18:12:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.2.2.ebuild,v 1.2 2010/03/26 21:46:04 yngwin Exp $
 
 EAPI="2"
-inherit confutils qt4-r2
+inherit confutils qt4-r2 versionator
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
@@ -45,7 +45,16 @@ src_configure() {
 	use geoip     || myconf+=" --disable-geoip-database"
 	use libnotify || myconf+=" --disable-libnotify"
 
+	# slotted boost detection, bug #309415
+	BOOST_PKG="$(best_version ">=dev-libs/boost-1.34.1")"
+	BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
+	BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
+	myconf+=" --with-libboost-inc=/usr/include/boost-${BOOST_VER}"
+
 	# econf fails, since this uses qconf
 	./configure --prefix=/usr --qtdir=/usr ${myconf} || die "configure failed"
 	eqmake4
+
+	# link to the correct slotted boost version, bug #309415
+	sed -i "s/-mt/-mt-${BOOST_VER}/g" conf.pri
 }