Version bump, implementing latest eapi, python-r1.eclass, no longer slotted boost, and general cleanup; with thanks to contributors in bug #478840

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B2474AD43CE296E!

4 files changed, 93 insertions, 29 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index ca57ed39002e..cf6b0abb52a9 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.211 2013/07/17 19:17:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.212 2013/07/31 15:33:00 yngwin Exp $
+
+*qbittorrent-3.0.11 (31 Jul 2013)
+
+  31 Jul 2013; Ben de Groot <yngwin@gentoo.org> +qbittorrent-3.0.11.ebuild,
+  qbittorrent-9999.ebuild:
+  Version bump, implementing latest eapi, python-r1.eclass, no longer slotted
+  boost, and general cleanup; with thanks to contributors in bug #478840
 
   17 Jul 2013; Markus Meier <maekke@gentoo.org> qbittorrent-3.0.9.ebuild:
   add ~arm, bug #473472
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 40dafeb06f48..e62d74465fd5 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -2,18 +2,32 @@
 Hash: SHA256
 
 DIST qbittorrent-2.9.7.tar.gz 3606781 SHA256 d706a8aff16cc6977379f5b25b842194dceef3b20efd0ca949300728c5a6a190 SHA512 bbc29781664432f7ebe42bb386c5cfd5c4eb5784f36620bf86a15a3e66f6cf3fe3a45831a4b552d5b48d5d1613591d208e6732e2a1a44ef269fd33fac9bf9cca WHIRLPOOL 5129c392345a371c18dc8a226e1c98ded5833019e1fd99a131f28e08ef310e3a4874930c8d2750742ff8f4cba0fdb5d9b926226e87b6911830ee67614ad361c1
+DIST qbittorrent-3.0.11.tar.gz 5097233 SHA256 bce32693c265bb330776337da6e88be3e5e50cf218b2fa8c5cd6c515e7158480 SHA512 f0350ae3db9b56d4fde67b538a5599058191300b90ec1a3708aacf68f5353be63c11f9699a84844ee00186aab9963c7daa4f7d1ed862520682be69e9173590a6 WHIRLPOOL a24f23934970420136a9bd6cebeafdda7e283d5c1118c9d85bdac3485afbb43c684dd9f22c85c8dd3e135e08a72d2766de7e345566d8267db11964454452c29b
 DIST qbittorrent-3.0.8.tar.gz 4913131 SHA256 82c3cdea90785672d0c2a419b544ec6557be2578610d3e9f83b61a12af77437b SHA512 bdb512a50848c99219e1ba013f2fd703f644fc1aaaa79c48ce5e117be5a51ffa64cb8687ad3caf74c7db63b6e20bb5d34297cde8b43aa1eda2130154615e5baa WHIRLPOOL 5b944b51936b0436275fb79b49f10253cc3a7ebad3d8920861e673f71d1e4c8ccbccbcc84e780982caad2c2364d56ca4ee0d29fa3637735cab73c1d54e668d98
 DIST qbittorrent-3.0.9.tar.gz 4980991 SHA256 df091656dffd309eda52765303146cbc2690e8799f872b8193ac8b6bfe3b571c SHA512 e2000188a08a160ea306b20c691288a84b053ac7d73104eab8af355cad59f7c4efce7c757ff062ae75e41efa76c0f2f0d7b5be1d1a5ffea13f03b38447bdac2d WHIRLPOOL 53cb65c8c99ec0a44c7229d7556362c1d0eba925c71e08c6e981766b6217ac68541c88994d10e611ef8b749492bd0a80453374e69488fa7c03aebad4f318c368
 EBUILD qbittorrent-2.9.7.ebuild 1663 SHA256 b9953da29357f7b323545fa855d8e42f21fc0c6c0633cb2603c8fe8f0e5e3c71 SHA512 ca27a551d58af6c2d07540932009a9fb0bd0ed3290e63473638d28ebc7749d6d9dd76e8a9f32c3eaf1c81201cf00f8d8be571a39c456a8630cfa91f2ef946dfb WHIRLPOOL a038a5da617485ef61e1a99f13eb0496d270ddcbd36e244999f34b7641c1ac42e6263ffd4f16344af4cc994e3bd146f043635937dbb9bc69489cd01071b79529
+EBUILD qbittorrent-3.0.11.ebuild 1359 SHA256 73f8528e357720c663b6b1441df3884f9b4e53f6a21165a24a1e36eea8d29966 SHA512 eba0467d97bbb15008a0b308886775811e37dade5f64f86f80e47d30a344492a2a2f33cc985b51b62584be3c7b8621f3f6150f386aecf6c09b62296747e80104 WHIRLPOOL a904364c34c459d4e9698f463ca623051b634e0aa96af236572052a9f8b865b9b2ed9422bbf90541753babb79a44568c6c1312db36d020d197ffba268acb331e
 EBUILD qbittorrent-3.0.8.ebuild 1670 SHA256 472974453135d7bac5ac14667d790fe8b45658d0d541143892d1b81d0fcd1b55 SHA512 09b470d2928e61037c28dd2a3ad432a6220e195131cfbad35ac5dc25a238e33b9f63dd536e9a71d6c63c08b1975f7759552d9797cafb869ab278ca451f4946d1 WHIRLPOOL 38d899d37ec7b8edb41c86b4f87d7d25b5c8d39a129325259d0d0567e7b18c245843ccf2df7b0babbd961e595ee3029dec840320aa16ac02cad02beed192f57e
 EBUILD qbittorrent-3.0.9.ebuild 1677 SHA256 8e8ddb22be4d7fb769747ecc14f36f3a84607df45056a733bba6011455d67ab7 SHA512 bcb57b1fd0660aed54b8b0fd3b3e483f3b935fdefa40c5e2619e28a2f82ff3f8a2851026ddd0ccd843b6529186a6480fcc02abeb2cdd0a5a20b8a5dc53627127 WHIRLPOOL b805739bd3b5e258ea7f9736f586d305da20a2e955fc5662825f338c1bb079b8a0f2f06f2e08b6d7852736a0071ab21cc4b4e093c9170f85297d75cb531dc29e
-EBUILD qbittorrent-9999.ebuild 1668 SHA256 b27ab553febb41f6227a0d28fef6509a228211c862e21e8a7e518e9a70924f81 SHA512 b4a18254771868e7303ec35be9804cebeeda50f0c6366c0c4464ac331747165947e0e1ec06c91718b568fa0fffe2805a455069423f02c93656ec27587c462cda WHIRLPOOL 3bed2e3dfb676f075311fb18fc2def2d20009cb9470feeb898b8bdc34b9d9aeef2011654b123ddd4709f2696a85800661d3c6acb23cccd9d96e6223d56753aa2
-MISC ChangeLog 35810 SHA256 f5c80860b5108a28ecbe933217ff8ef6d80677e3265a22f9fc9624c8c31b7127 SHA512 5410033860b37d5371bbbdf8e21d9b866fb9509d5eaa856e3f5a147ef05a5c89a370b1e24a600aaec59679dbe0d05512cef2c4c3ce54442c9da2d96d2dd27160 WHIRLPOOL 484f05e202ad9fa4c71fdd5c3d0cc1f22d0011513c4ee30d6fbf22ec2b37e5a1ae546503118916a08f566e0afb003c1721898d16fa11ab0d2e71bc61274ea8fb
+EBUILD qbittorrent-9999.ebuild 1348 SHA256 1336dc6afa7684a0342e093bafd48859fd63d4f60f6429608098e33f47e42fd3 SHA512 2246efd8b6865c8782931b097e81d2ef2f901a8f640d3a44efe73c5f46c8768d344e3c4b2176c3974d9aa6a924c56ee05026ea68a78fd4b84e0529305b7a0b18 WHIRLPOOL ca9b9aea985a5b43a73d8fdecdb25b83d976131e558b02837a562f021bd36fbc0ad14b097d7646bca97d51a6db9dec39d7f94a4f933e001dd6db3de0bc41e05f
+MISC ChangeLog 36100 SHA256 37abb936d501c25c43543fcd727f14ce6bcc45209995ac4635fb7f657fc87efe SHA512 9395784205763e9805eb8ea5922f479c5d4ae83154ad3d6c5e42a1a0434772ea65d4331e4b6277e880337cb50e34d2979a1ecf5cda17fbf102b1744dd9bf0aff WHIRLPOOL 88015cf5e9fd78025c2b0686cd13f5547f7446e70f2d336717130f58ee143ccba56840b4149fe697e692749bc1cbf0644865be32014611dfe6b3cd35adf66550
 MISC metadata.xml 374 SHA256 2108fb37a2cb5860e8afe2b4a4995daa1f3a261e44519682a4367732cf6cee71 SHA512 608b2a2760bbedc27bf313610852179f5aed2783147d177cab83d2c70d7e902745e84b908af4de0f7c2ebd2a368387e6491ef2a96c2c4c47e1e9caaa8e2e88f6 WHIRLPOOL 52b94dacfbb52f2dffd0f9cbc6d11cd77378547599b39ed7bfdb9de0187ee500da168527540117d6083e885ebe470c51e5b0942cdb3025e6e7eec60bd2ec92bc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHm7xYACgkQkKaRLQcq0GIBoACeMQ7yzwJ/XS6dgwe+7xpHC+VO
-0j4An3wHH/fmu6vsOUZTsTX95DbhisDh
-=DL5S
+iQJ8BAEBCABmBQJR+S4wXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
+QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu6EQQAJE6Fl7hBef9HAzLcplIsrvb
+lbMeCLNhKc7PyO0XUGizXZ8z52KF/XMUuZO98nmK+SiD7NUPNVu9KU5wWVUc0Z0Z
+h35FVvojbBEbVG7gldUHVzLb64yD0UzzoGyyA1GoisAXL68Uvh8GV1xBhKmEALR5
+9JqcyxrspsDBptdzP6N326t09HnWdQ0tBKXoXF0w6NALzFlPcXxZA2QceH238qql
++8eo+3/yG8VRXUN27l4lCEw0cOKBLbrB/g4klPVv81IigdcJ3MJbus1XVIbyNKm9
+zlv8EpQhT6MYHp+x5nc7ICM0FV50wcuIFAwJqY+eZNGPOxjvDcqTdCYoM/b50B2i
+QHxEbp3V6Eia5QFuj4pamT3cKDyiRz0U8ObAB+/b9RmB7RwS3XdPt0RDJs/188o+
+fit/VAnjk0WEjx6FTBK9EPVH4LSn7g2ZtS0bwxm9fVtMIrboQF7dJH6dn81P62BY
+cnhobNeuQPcpIdZgwCUdizpwsnLkGKSh2XCDgfvAZx7TSZYyGeiJ2xvyjVHaGC/X
+wMz+T7IylkKJ9j5cOGSxkMD5d7SLIkjW2IowZymLkw/ZG5StevAqvdCCnmHP7JvE
+mQLaD/wOUKxn9P5XRUtW44qGMkDfJlj7TfTeC06OkuZYs9aqQ70IjYu+1R7Er3A9
+1zXYC7JgK0PBENs6P5c3
+=NdPj
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild b/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild
new file mode 100644
index 000000000000..936816b45ab2
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild,v 1.1 2013/07/31 15:33:00 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit python-r1 qt4-r2
+
+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 ~arm ~x86"
+IUSE="dbus +X geoip"
+
+# python-2 is a runtime dep only, for the search engine (see INSTALL file)
+CDEPEND="dev-libs/boost
+	dev-qt/qtcore:4
+	>=net-libs/rb_libtorrent-0.16.3
+	X? ( dev-qt/qtgui:4 )
+	dbus? ( dev-qt/qtdbus:4 )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	geoip? ( dev-libs/geoip )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+S="${WORKDIR}/${MY_P}"
+
+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 dbus 	  || myconf+=" --disable-qt-dbus"
+
+	# econf fails, since this uses qconf
+	./configure --prefix=/usr --qtdir=/usr \
+		--with-libboost-inc=/usr/include/boost \
+		${myconf} || die "configure failed"
+	eqmake4
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 4cc9e3bd1132..4cac71e89418 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.8 2013/03/02 23:09:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.9 2013/07/31 15:33:00 yngwin Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
 EGIT_REPO_URI="git://github.com/${PN}/qBittorrent.git
 https://github.com/${PN}/qBittorrent.git"
 
-inherit python qt4-r2 versionator git-2
+inherit python-r1 qt4-r2 git-2
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
@@ -19,25 +19,20 @@ KEYWORDS=""
 
 IUSE="dbus +X geoip"
 
-QT_MIN="4.6.1"
-# boost version so that we always have thread support
-CDEPEND="net-libs/rb_libtorrent
-	>=dev-qt/qtcore-${QT_MIN}:4
-	X? ( >=dev-qt/qtgui-${QT_MIN}:4 )
-	dbus? ( >=dev-qt/qtdbus-${QT_MIN}:4 )
-	dev-libs/boost"
+# python-2 is a runtime dep only, for the search engine (see INSTALL file)
+CDEPEND="dev-libs/boost
+	dev-qt/qtcore:4
+	net-libs/rb_libtorrent
+	X? ( dev-qt/qtgui:4 )
+	dbus? ( dev-qt/qtdbus:4 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}
 	geoip? ( dev-libs/geoip )"
 
 DOCS="AUTHORS Changelog NEWS README TODO"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	# Respect LDFLAGS
 	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
@@ -50,13 +45,9 @@ src_configure() {
 	use geoip     || myconf+=" --disable-geoip-database"
 	use dbus      || myconf+=" --disable-qt-dbus"
 
-	# 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"
+	./configure --prefix=/usr --qtdir=/usr \
+		--with-libboost-inc=/usr/include/boost \
+		${myconf} || die "configure failed"
 	eqmake4
 }