version bump

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 84 insertions, 15 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 52f4f6a93146..d4c8136dec61 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.180 2012/02/19 23:09:44 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.181 2012/03/18 10:41:15 hwoarang Exp $
+
+*qbittorrent-2.9.6 (18 Mar 2012)
+
+  18 Mar 2012; Markos Chandras <hwoarang@gentoo.org> +qbittorrent-2.9.6.ebuild:
+  version bump
 
 *qbittorrent-2.9.5 (19 Feb 2012)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index b3ee4d9f461f..2ce89e6ed4f2 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -3,25 +3,27 @@ Hash: SHA512
 
 DIST qbittorrent-2.9.3.tar.gz 3468464 RMD160 424599ff261c5dc2304461c2e10d313aff8c91ea SHA1 b17d06a4e6a5b733f6fdd9658c78199bc6eab77b SHA256 5d82acaae622f1376a563e94afa31e1a475b64d5f1828e5b11b18b0bd4f4e0b3
 DIST qbittorrent-2.9.5.tar.gz 3537945 RMD160 a2e4fa1983d91549dc3c3baf144372204c6287e4 SHA1 ceb7df674000033c40c420f09841239ca40da816 SHA256 3066f16edcbe8571b5e6c746cabe9ce784df5f566b95388dc24459ff786023ba
+DIST qbittorrent-2.9.6.tar.gz 3606801 RMD160 7ff541bd69b94de82d5da29a1e48483c545bb596 SHA1 0ba384b49dda419b813a2fca9a0d600aea53bcbd SHA256 3ba9f682f3ca621cc98ba36abe6b83045756af52f19e2f9c232c8edf8de19c7c
 EBUILD qbittorrent-2.9.3.ebuild 1675 RMD160 fea01126aff531071b7de9a270867ab4a1f970e1 SHA1 8b623b6f1df8bd739f3535cc7487528475566bd6 SHA256 812247bfb2701c95821bcf2e574205489f439e402b70ff54cda8f8d43962218f
 EBUILD qbittorrent-2.9.5.ebuild 1675 RMD160 bcdd85dab35058bd6243f8470f6ce0e38c960725 SHA1 a37e1de49c032486101fb198b3e623b486f707ea SHA256 5abf275b7c655c81532efe436d5a191d4ca41b78d301e27cd06efe030be9c6bb
+EBUILD qbittorrent-2.9.6.ebuild 1675 RMD160 6bc5d5213a42b5c4b3e9fe589e4d23d728da8cab SHA1 9684e6600dd8cec51ae9517efcdd36bc338890bb SHA256 ef3e201261a0e2668cb6c8464f062b01aaa06cbc57f5866df6a6d82d56f1674c
 EBUILD qbittorrent-9999.ebuild 1675 RMD160 c387598d6ab08af1aafab5f0112f7887aa8965b1 SHA1 27830211ecb3d325fbe956f9823b210eae1db76e SHA256 ebbd654bcb2cafc5634ade4c4895e0d1612eed57289ca5ac43f6c069bf9c39c2
-MISC ChangeLog 31076 RMD160 f4e6751e34dc6af01dca0b8f452831c8a516d307 SHA1 ec583cd551db2882b59138ac2e07b5cc97fffebf SHA256 b8ddaae41214ea4982bd8f5a942eb238da7a957ac0c8a5a5ece6e74750c89532
+MISC ChangeLog 31206 RMD160 c43e1b9d7327d34fb949e309fe7c1df29a14c870 SHA1 25db017539a76948d2a24bed95209f7c59e8ff16 SHA256 a5d6e587adcf6c45608e2089f011cda4ba520e89852db176fc8c40517847b930
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPQYEDAAoJEPqDWhW0r/LCZXEP/jB8ZhmWF9EqxqB/8u2wTIzb
-eGjBeY0qgovcbkwz7MGdnrkxKh2jaX2F3yjkvN9Ast/NB1TxFzENcHKsudH/HKpH
-mQTL0134XTc/ayAebja7sjK28mcdelYdmOUqJWQYyQW9SEyKTWX99l8O9KDa64sB
-fZV7/rwSmFGT5Df9Y63GukXkLzAQcHiT9OetZ/BtgJHhS7XqmpyzDfZsqTzirtO4
-YhU0+6+nvfWliKhv0kUf4hEh0ZFIi07mHXK3n3Gzwdh9VWScXZY6whjaHpASG/oR
-wl+Wazn3eAhhqjjb5mNoXb85YtaGoJq5XumvYgq2A/Pj1wOtkIPNs6oYn5r9c4KO
-p6cmhgLW9QwUjy5cbgAIbhDWaLheZXls2R62j3/3jbyYm3KFcZnSNA3zGOH7Ohw5
-AcUFZy8zSi3DVd3p1HpEG4te9y28cEsr1HhgmvTTX7goeEI6qdJ1aBA+KStRKF4z
-9U/jnFbw/4+uKx7JjanLJ1Dbaa9nEBHRzMAb/yA82gcwYJdHcX4hghN92YxCylAB
-fTybqIizeFJ1NuTZO4Ua+ZClwKC6kh3u1ZaZa+J+ZM/WmQlaFP22oVn/ROfdqPqW
-GPdgTP67+xLSIDPJ+QFnGt6zYNusVOLNAII58QIJUrFa+rGJD+t5cQ1rpso5ECvO
-3C3VoT/tM+NNYyUNx+Ck
-=UpIV
+iQIcBAEBCgAGBQJPZbuhAAoJEPqDWhW0r/LCrCAQALZORLskNo1nXjvHm+k4eJw8
+Rytf5VoEucW/+RbjFs+LAw/twPFhjFhI0kAi/db+luewg2l7K6IDeIr202JslNJj
+hcP26xql+LIxyU18mvWw4XBUIIA9L3/JNzPchIM/Vj37vdf4MMBeA3wRypVm1btI
+FeLjgRlyewCbeBwF8CWi+uEWa7eCmGyyBplB++/cJMmYRMZ2YhvYlL78BZ6Y+lb1
+B7wd6AiwgJ3kfzwZvx+llq5qdpeMt23xi+FTHx1fzfGs7V/3832kp2/IWmtHSAaj
+P9xmQ+7l9CKRo4ukISrpBZbBmoV+t81uEaavnOpW115bh3vSS9RjhDN8UTw1EA0t
+g+OchRsIl79kWqnVu0xT+uqXu0Bz3QcIS8gSoa/es25iWdHkEvjoWRFBmpyw045l
+Q2WfvCRmWlluFgFfV+x0Cc7cQpkFucir0/scdf/4fsH1RyJeVQEe22y9Zpy0o73K
+Vl9zLzJS2I2g81+UF00Iho/BktDHowitxAhZ8qVYBPkUvDzvHqZNVy1MTLViFS9V
+AfnXclwRk7J8oeSsiEliGDrGFhYuABDSHrK57phoDJZAx7el9qthxHqwj6AZPgvo
+HOXn3+IrwPZIAnIPgeM/tz+InmNbPcBfWdMGqegauezV2FfyI3hWf8Rh333ByrkC
+Cvx4X5uOYdVi++mE9YFm
+=toam
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild
new file mode 100644
index 000000000000..681614146add
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.9.6.ebuild,v 1.1 2012/03/18 10:41:15 hwoarang Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python qt4-r2 versionator
+
+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="dbus +X geoip"
+
+QT_MIN="4.6.1"
+# boost version so that we always have thread support
+CDEPEND="net-libs/rb_libtorrent
+	>=x11-libs/qt-core-${QT_MIN}:4
+	X? ( >=x11-libs/qt-gui-${QT_MIN}:4 )
+	dbus? ( >=x11-libs/qt-dbus-${QT_MIN}:4 )
+	dev-libs/boost"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	geoip? ( dev-libs/geoip )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+	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"
+
+	# 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
+}