Version bump

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 135 insertions, 2 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 1bc2240af4f8..17518a772083 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # 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.100 2010/07/17 23:18:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.101 2010/07/22 17:07:38 hwoarang Exp $
+
+*qbittorrent-2.3.0_rc7 (22 Jul 2010)
+*qbittorrent-2.2.11 (22 Jul 2010)
+
+  22 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qbittorrent-2.2.11.ebuild, +qbittorrent-2.3.0_rc7.ebuild:
+  Version bump
 
 *qbittorrent-2.3.0_rc4 (17 Jul 2010)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index f4d09eb81f2e..4d07192d5709 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,8 +1,12 @@
 DIST qbittorrent-2.2.10.tar.gz 2729578 RMD160 bdac38aac89a1c264a831470080062d9a604e4e9 SHA1 10404235846161dfa6eaedffcb6e996c9b9bae49 SHA256 4ba5cea2711829c612922b1741490045f688548049e2d4da411b60da6f341a18
+DIST qbittorrent-2.2.11.tar.gz 2727964 RMD160 96e81471d0993c068b3b87c13ffa7b1d7d6ef3f2 SHA1 ef6c267acb3ff5b2a1c5951b2e6de88ce9b1f7ef SHA256 20a8b1c403048da89d73ce59ac95a8f2ffe2777c97f8f23bded63ac0027794d7
 DIST qbittorrent-2.2.8.tar.gz 2603947 RMD160 1e74f4fcbcbc7e5d2310833115edf282ece73638 SHA1 6b2e8f1ab903c68516d16866bdf0579da689362c SHA256 49f2ad035f1eb9b3d2c7ca10b3539dfb7fb07db1f2eef8b41ef6223ceb734c81
 DIST qbittorrent-2.3.0rc4.tar.gz 2841843 RMD160 4acf72b1a3b96d79293212fd8d5f2f1d251cf7f4 SHA1 a15f4c2eeb40f6e0d786b50dbb9ee89374d99b91 SHA256 0860a68402b1bd85242433bb1c46e08483414ee08fa064cc58f8b8594755e5e3
+DIST qbittorrent-2.3.0rc7.tar.gz 2869384 RMD160 55576605047d85277bde04155eb61c5a80ff9fa8 SHA1 a9db53e736f4dec9fb6a284407195c4a13220c61 SHA256 2dc567905fb818d700d4f8c2a2d2e2e42ce4674115a00aee9463829c1bb7efd8
 EBUILD qbittorrent-2.2.10.ebuild 1685 RMD160 597471a12d9ec3cf7c6204cd04ffa930e60c1423 SHA1 0871751b2e3976daa1dd9d97ef50c6aa9c5ac3a8 SHA256 85845c8e83586cbb9bc6e3a930baeb00d3116bf97940eea481ab7f374c5ceb92
+EBUILD qbittorrent-2.2.11.ebuild 1685 RMD160 26e3e4fac0ccd4cf82a031e3f5a55c49418282a2 SHA1 ddf63d58792b127fb11df08e84eddafa0dd8cad8 SHA256 79d4f86e8177967db35aaafcfe45555d8e66b58a296f7fb9bdee345cbec5ada3
 EBUILD qbittorrent-2.2.8.ebuild 1679 RMD160 fcc8a4d31f5f54120f294d1be34773d13a9489ed SHA1 3c619cd155b2e2c913fe79ea2f80107ea06d5b5a SHA256 e97313f8147eb6655b69c9062025707d5d0fdac977e7941612bed20687bd2ace
 EBUILD qbittorrent-2.3.0_rc4.ebuild 1731 RMD160 644d9a689bfe343340554ff0c103134e11202f3c SHA1 ef4e75a43116cfd4f0e0c647f38159ec68035b1e SHA256 a0ee1bc424ff3071726be003180d817d774a05e65a895ecbf918fd100d55a90b
-MISC ChangeLog 17077 RMD160 b2bf61dda3d814dc45716a51e371875d1352b159 SHA1 285bac0c7745ada910cfe9a1c2e8703167e7c607 SHA256 07f708786775d9b6515af1326e79e50e3a0be27592051efc2ec415078cee02a2
+EBUILD qbittorrent-2.3.0_rc7.ebuild 1731 RMD160 a7d7abbbb78889c7b4e5b3e15779a4e5de9cb2aa SHA1 c9220175f86421a565ee5722de0ea05e544d56c1 SHA256 438fea153ad2f417593de4513992de2d2c1caceaa271c1a824b62d3f0cf61a85
+MISC ChangeLog 17279 RMD160 bd4e5e81205e6f361bfab08a00eb46780779bea2 SHA1 753fae17f1f5df79a1ddf9d930ca2269e070a8cd SHA256 eacdb284e4979775fe76a37e8f90082c4584ddf826e1c1d117f4c846bbcbe13b
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.11.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.11.ebuild
new file mode 100644
index 000000000000..2c5e7e7785fa
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.2.11.ebuild
@@ -0,0 +1,59 @@
+# 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.11.ebuild,v 1.1 2010/07/22 17:07:38 hwoarang Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+inherit python confutils qt4-r2 versionator
+
+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"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	geoip? ( dev-libs/geoip )
+	libnotify? ( x11-libs/libnotify )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+pkg_setup() {
+	confutils_use_depend_all libnotify X
+	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 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
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.3.0_rc7.ebuild b/net-p2p/qbittorrent/qbittorrent-2.3.0_rc7.ebuild
new file mode 100644
index 000000000000..33a93a45038a
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.3.0_rc7.ebuild
@@ -0,0 +1,63 @@
+# 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.3.0_rc7.ebuild,v 1.1 2010/07/22 17:07:38 hwoarang Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+inherit python confutils 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="+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"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	geoip? ( dev-libs/geoip )
+	libnotify? ( x11-libs/libnotify )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	confutils_use_depend_all libnotify X
+	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 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
+}