Version bump to 2.3.1 and 2.4.0_beta1

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 139 insertions, 2 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 8df4e4b8fa2e..da9f6b18722a 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.102 2010/07/28 22:35:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.103 2010/08/19 00:51:35 hwoarang Exp $
+
+*qbittorrent-2.4.0_beta1 (19 Aug 2010)
+*qbittorrent-2.3.1 (19 Aug 2010)
+
+  19 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qbittorrent-2.3.1.ebuild, +qbittorrent-2.4.0_beta1.ebuild:
+  Version bump to 2.3.1 and 2.4.0_beta1
 
 *qbittorrent-2.3.0 (28 Jul 2010)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 2fa68e92ed99..6cdb27e5a278 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -2,9 +2,13 @@ DIST qbittorrent-2.2.10.tar.gz 2729578 RMD160 bdac38aac89a1c264a831470080062d9a6
 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.0.tar.gz 2959148 RMD160 6f66b70c691673f4664aaf647c852d76e049dccc SHA1 e73961c935d518d93a2377b817c0d0042b30a2ab SHA256 c961ffeae9fe86dda365c9511550bf645e63baea122b6954e0d87b3bcd4c9191
+DIST qbittorrent-2.3.1.tar.gz 2961167 RMD160 3a3b13aa4696649aa2bf4429d3e2d7095025f85c SHA1 d180125855b813e75343ed041d26ce35245fe0b0 SHA256 d2e244a4a716a295d67feb23f404c6c8398919fa1410d45384e75cf37ed35b00
+DIST qbittorrent-2.4.0beta1.tar.gz 2974523 RMD160 b52bd1a3eb3b4ba700cc476deb8b6afc8d4ad6b9 SHA1 daf8674d7d5968fac60a835f250da40ace97b224 SHA256 9e90e8eb322735f0fe26faa93ce74cb161119fed20a25c2970152696823fdc54
 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.ebuild 1727 RMD160 0e4695e6d3054a8dcc6750f007991a34182cfe51 SHA1 69e84f34b6b1cd19e98181151ff0e7ea558fbc72 SHA256 2a6e599006cbbd04f2650be2c50cbbbc241297138f1a86adbad79f2098dba5ae
-MISC ChangeLog 17495 RMD160 f3a8cde985a1e06a3489835c2ba97ced326e4a95 SHA1 703113a7e71dbb695ce7630f6a0f5b2fd0a7e1f2 SHA256 5776f8b7dc6441853a8f4d7da5e7e90bee3c64720edef6378cbce14bd62f580c
+EBUILD qbittorrent-2.3.1.ebuild 1727 RMD160 77912b295fcfde4b4c55082e3fbab9ccc2f5542c SHA1 5f9b8bbfe698ec1ee69f22f1204e2aeaad490d2d SHA256 c26e7ac5df1cc58def23937ef936a2709ee00378ad6e0a5331b91f6ab23a38d9
+EBUILD qbittorrent-2.4.0_beta1.ebuild 1733 RMD160 8f93ea46ab8adaa6bc5fc6ae3f6394722fd9b6cb SHA1 f9b227e1d45b2238fbbf970f7fe562db643b8b47 SHA256 05b5d9d857198ccc58ca2d53057213e3c222608f3929ddca4d4e0d523cda7bae
+MISC ChangeLog 17724 RMD160 2b345899f8a41d60025de5d602f72c79aa0e2069 SHA1 a6dbf8ab0b74af93afa0fcbe10fc21e0f2d11c20 SHA256 9d6bea2a87e643e4d247bf4dd601c2eeda7f101090e101e64fa69d46d624b03f
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
diff --git a/net-p2p/qbittorrent/qbittorrent-2.3.1.ebuild b/net-p2p/qbittorrent/qbittorrent-2.3.1.ebuild
new file mode 100644
index 000000000000..c9e826d63757
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.3.1.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.1.ebuild,v 1.1 2010/08/19 00:51:35 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
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.4.0_beta1.ebuild b/net-p2p/qbittorrent/qbittorrent-2.4.0_beta1.ebuild
new file mode 100644
index 000000000000..edf2146d6ddb
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.4.0_beta1.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.4.0_beta1.ebuild,v 1.1 2010/08/19 00:51:35 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
+}