Version bump. Remove old ebuild

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 89 insertions, 18 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 757410d97a29..aa2353df0b79 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.149 2011/04/11 09:20:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.150 2011/04/20 22:38:42 hwoarang Exp $
+
+*qbittorrent-2.8.0_beta4 (20 Apr 2011)
+*qbittorrent-2.7.3 (20 Apr 2011)
+
+  20 Apr 2011; Markos Chandras <hwoarang@gentoo.org> +qbittorrent-2.7.3.ebuild,
+  -qbittorrent-2.8.0_beta2.ebuild, +qbittorrent-2.8.0_beta4.ebuild:
+  Version bump. Remove old ebuild
 
 *qbittorrent-2.8.0_beta2 (11 Apr 2011)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index be14720f073b..8cf208ce8ec8 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -4,28 +4,30 @@ Hash: SHA512
 DIST qbittorrent-2.2.11.tar.gz 2727964 RMD160 96e81471d0993c068b3b87c13ffa7b1d7d6ef3f2 SHA1 ef6c267acb3ff5b2a1c5951b2e6de88ce9b1f7ef SHA256 20a8b1c403048da89d73ce59ac95a8f2ffe2777c97f8f23bded63ac0027794d7
 DIST qbittorrent-2.5.5.tar.gz 2819850 RMD160 b91d9ed0a355d87dbb5d0304026ad11af1e833ef SHA1 1bc5031887f80a5b3316a58bac9318e05fb69b3d SHA256 4a061bad1c9b4fd1a21508718a14c69fe9f03a85b19ee343bc18d187af380359
 DIST qbittorrent-2.7.2.tar.gz 3157190 RMD160 dc3cdb524e864eff4cb934a7e606476c118ad885 SHA1 fdfec52385187d9895981aeb68b9081b6789362f SHA256 1e2f802c03350b19ef6610fc2048683fb22a46e7ef6638335855f516465b639c
-DIST qbittorrent-2.8.0beta2.tar.gz 3165504 RMD160 818b510f8b8c3647a93689d653eab73539e239f7 SHA1 aaf1f2cb46bc7057b4ce36dd49ee1723c52c590e SHA256 83bd5d15ff153c2009e8694e9f95f374c5dd247defa47d49c461be640ad57e12
+DIST qbittorrent-2.7.3.tar.gz 3158727 RMD160 39b12712af96508d7f0542a3d37a78df915555dd SHA1 99a5deb6abaadc0857cf3067f7d38d5ff6f8bf88 SHA256 256412dede40645a434fbbbc4582298eaefc1e33c17b8e6b8a88cb86bb2850d5
+DIST qbittorrent-2.8.0beta4.tar.gz 3155882 RMD160 2c5857e90a22040e24633bd5483b7d2200759ce7 SHA1 410215db9772462c4c746ef3439dfeb0c70a06ae SHA256 976f65a495867fb14d1d002d7e21002ed838f9f754cab16fa115afc1f79efaa5
 EBUILD qbittorrent-2.2.11.ebuild 1681 RMD160 d9bc680590ce1751d5411b51aa82fec4c714195a SHA1 4884f7865d99778ba01835275022541ebfa4ca26 SHA256 cadc4893aff16dad7e93693bd9707ab1f7e61924b24dd357aa82fc8701237a82
 EBUILD qbittorrent-2.5.5.ebuild 1747 RMD160 dd3af21cf1dfe296683f9c28703ac004df722886 SHA1 6291a1f1482c20b0ef517686af14862bdc98ae30 SHA256 4395f0944f9a51fd6ec0bf04366b5379845da8ebf3f193b2f60ee5d2a2787fce
 EBUILD qbittorrent-2.7.2.ebuild 1675 RMD160 c9114941d367e1b6ace0404e8e5b169bf3716722 SHA1 5d4dcea6829f137b3f4ade71f08f825d92d7b3b4 SHA256 1459ca078722a7045680271a3a4a1c645a9910720932fae24617e164c936a6f0
-EBUILD qbittorrent-2.8.0_beta2.ebuild 1681 RMD160 ba614763e2ba8fd80919e5b1bdb8402eafd25fca SHA1 063142d966f4ee6c2e3b189ecc3a633e9e6a525a SHA256 dbb9f353713f3f95ddc4c3ae9e9522dfd8c453c39788002e82b3c82a030afeff
+EBUILD qbittorrent-2.7.3.ebuild 1675 RMD160 566b1c1746cf8cc12567048be5181201775c227d SHA1 9f46cb5651d3c32934ede15680382482e070f963 SHA256 bde646d2f55d71db93a5b03b99992309ca787a7a520e06e7e7f5fd29d5fd1c85
+EBUILD qbittorrent-2.8.0_beta4.ebuild 1681 RMD160 d785e316b0415a1534366e47a07bb4b1aa97fa91 SHA1 d1c7ebec2553e1624179ea1171e11bd0bf69357f SHA256 5521dcb728471ec65853fc5dd940d4b23a1d8dd9f11a48a51405f4e54e97df74
 EBUILD qbittorrent-9999.ebuild 1668 RMD160 69be24b699863765ca3285d882f050d4a42bd670 SHA1 d356e66b1809b19074388756c80b28d44640c50e SHA256 7492aad364035b5012bd3fb9e4003fc7bd534984fba0bfea4c77fa7993111ee8
-MISC ChangeLog 26245 RMD160 0951623c77e7433b543a059957013372b64da938 SHA1 a524d878e3bd2471a251392cc8f0a4f1e5299647 SHA256 9315fc12ce74177fcb96feb6628aafed2a38a15a0b7b6411e84464f5fe9614dd
+MISC ChangeLog 26501 RMD160 157987d4ebca41c80aa3a39706dc6036198b098d SHA1 ef72edd6be259b8b3af9a6437eb51365aa902fc0 SHA256 f0a45758d146ed81f4017e743e27301ebec450a734efd7274ea95f9d4e2e8631
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNorkSAAoJEPqDWhW0r/LCBJAP/0M7OeutRByz7vA3s4zGJHCK
-eKvRAg6LhtN9CLxr9ZhTMHW8+lH3XHyfcO4DTZeOPGmty78U7Qg3ZXApNGfLB5wQ
-F9kY3tEqfyJh8ZIj6YWZOtLMgC7aDFnMKYzGogrwao/Jp1hOpScjBfsyS3stv1hT
-blmHkjO6WyOnbpUmX1QU3yj6bs4hLwtC81Oc6qqL6l2DvALEAw9QVOPmtM9HhTSu
-YbVYaiakFFXC4R5r4915wO8NcBv1H1oSvluvesFGZmnh12XRZgF66x5t0/8u2nZR
-7jGlJmVGPEQlM3846Lzs2BOcgpQZHUrURzo5E9BpJAjQeXpG2J/fvqRCGvqWE8Kk
-Gt5EfSM1lZOPxOQNJ12x2NDH+EMau5qVMlX35cmQ1gvRhfIL+118JJhcVkARuJSk
-tQKzS0JS8xA7MNV1YB5iXEoJhrTxMkcixdOlJ3gj1fjwNrxr1CDuc3IBsLvyT36o
-ueg9r2Z3kpZIRLXw7jqsfXWhCI6gkidR+De1wCPYEO4F5xpcByJhUQH8lIpMjTIq
-cgc85bTEUtoxTB2J087fQNB0fk59qcWGdxXIY4xTU4sFAJRYeYnFz3eC8nde4RJV
-zQJPLs5a42/ptbNnkQtk4ABI45VIVvNpse7MCuVWmdSLySTGQsNdTvg+o8uw1pwE
-OHnzI4iHfSOgCjRdCrxP
-=sa58
+iQIcBAEBCgAGBQJNr1DtAAoJEPqDWhW0r/LCFmoP/AxHMPPS6DYDHGrBvGcEqKl6
+FkrWzKKfZaYP0zH+iWIsDJa9tzMwUpqVL7cfVU3cw33suegJeQWKrwft5vBQrYI8
+pgdz40xlDmTbxf6GvjHS8BMpBalHkBnES3N6Nznt5V9Dqg+kOsjsr4gjDWZcmDZf
+kGI1Hq2Tx8QJHy/6gz8fiyM/XrgVURtH7lDGV7pEsI0OYiZUcl6IkaM79fOHxmcb
+eFTAefDJBOJQEH9HHYkjebvAb5ajBLGAlcmPj9WwWPXt/z83R6HXGfT6RM9OoUSd
+fJMLhmVMLtMJjCRNsEK3wUVbOEuTtJN74yyctJ12U40czLGINzHHuaM6vD9LIyNP
+EP/RVjWj05cY/lVnNY1xpnQSySWcb5f6eUarVC8wFi1b2WzcKcU6hpxyEaTEuuPU
+0HT4+oSziGGcjwGktAL6xVMnSRRTwMXNy4QDRXpmyc9SBq/tPAGaP2IC4ooYL3WL
+w2t8PYg0wePcXkFxlSJBUgZ10hQPx6r94KDB+dEqYQ4CXvXyAB6qhjOtikR2bSiX
+7uyfKK7HhzIPUwuSi9JQ9xQWmTZ6MBr5rx+c1RG7tQhhhcRRr7ryE5KPBubJm5ny
+5/wP25TTqEuwRFPTlahCLkh5wTm2We6zTxt0BwR/0M1Mh46Au1efQTNyJgWTnyu0
+WCgUMMTH2gz9z3vS0MHo
+=EEUY
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.8.0_beta2.ebuild b/net-p2p/qbittorrent/qbittorrent-2.7.3.ebuild
index 3f2202ba0e4d..2d46cbf71bbc 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.8.0_beta2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.8.0_beta2.ebuild,v 1.1 2011/04/11 09:20:26 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.7.3.ebuild,v 1.1 2011/04/20 22:38:42 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
diff --git a/net-p2p/qbittorrent/qbittorrent-2.8.0_beta4.ebuild b/net-p2p/qbittorrent/qbittorrent-2.8.0_beta4.ebuild
new file mode 100644
index 000000000000..4dd2b11533ff
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.8.0_beta4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.8.0_beta4.ebuild,v 1.1 2011/04/20 22:38:42 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.7.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
+}