4 files changed, 20 insertions, 130 deletions
diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index ff43ec2b50b9..6a206fe8c32e 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,10 @@
 # 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.184 2012/04/15 22:47:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.185 2012/04/15 22:51:51 johu Exp $
+
+  15 Apr 2012; Johannes Huber <johu@gentoo.org> -qbittorrent-2.9.3.ebuild,
+  -qbittorrent-2.9.5.ebuild:
+  Remove old.
 
   15 Apr 2012; Jeff Horelick <jdhore@gentoo.org> qbittorrent-2.9.7.ebuild:
   marked x86 per bug 411869
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index c015f0706a5a..2fcc5ba7cbc9 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,9 +1,19 @@
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST qbittorrent-2.9.7.tar.gz 3606781 RMD160 c00fc50dab1c37759acbff84dc563efc8e80cc8e SHA1 ea49b3031b1517fe83826627b38cf4df725b5f4a SHA256 d706a8aff16cc6977379f5b25b842194dceef3b20efd0ca949300728c5a6a190
-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.7.ebuild 1671 RMD160 48f29094d49176f9b8e4a3db1fcf9da0c05e008a SHA1 740548b7641cd9b2c49c9531ae7e9eaaece9c86b SHA256 53758804c7fba544bccd138039890ca50337b1cf2682b466d8530e9a2e917307
 EBUILD qbittorrent-9999.ebuild 1675 RMD160 c387598d6ab08af1aafab5f0112f7887aa8965b1 SHA1 27830211ecb3d325fbe956f9823b210eae1db76e SHA256 ebbd654bcb2cafc5634ade4c4895e0d1612eed57289ca5ac43f6c069bf9c39c2
-MISC ChangeLog 31579 RMD160 53d9a96a8dc82ff5788b6341340a78e313407e24 SHA1 97959a980d3dca45e82f64900de3556f3abe4b8c SHA256 5160e206c9a414de7d3f7bcaaf0dd9ed96a03508dda51cbf38ca142b554b72d6
+MISC ChangeLog 31696 RMD160 0ff52b06197bed3eea1e6fd769dac8f32013e610 SHA1 e0bf7b069e8d50ae8fec6bfc229f66312856b1f7 SHA256 67c6e57cf2156402ef70e1049970a0656578818c726bd1b3b72f430440616187
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJPi1EsAAoJEO+t9ga+3I3aD2wH/2JH6xNvNkpTQ0WNGm7TCV0Z
+D+lHfuIBXnF5BRdWD5zChWUpkFMpT6vxb3L9VH5KfMlXyGTZnviyIg+HnAT6Qc8e
+K9ell7xEbB16NOIrH+cOMvK55LUiQE3Z8g+V/dQ47jEucOKbPB6GpH2bksERItno
+SoGIjG8kWD22eZvmDX9edth78DRrmDUJCRRcwUhCYORc8b4cY5AcdNxdMXx7XNim
++q0mbcCmMwIPBVS2ya+X/ijm6GV9mexOrj7SS+CDQu7jLy7+zXHa8OaVs/UhC3IN
+vB0FJ1Y2i/QmcNKB9yNrinN/dpM3pJRZdI2uUQUQ7PRyfFbZn2OOGheaXQQaQgY=
+=MvBa
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.9.3.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.3.ebuild
deleted file mode 100644
index de80e792f6dd..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-2.9.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.3.ebuild,v 1.3 2012/01/28 15:10:56 phajdan.jr 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
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.9.5.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.5.ebuild
deleted file mode 100644
index 227ef2c95e46..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-2.9.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.5.ebuild,v 1.1 2012/02/19 23:09:44 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
-}