Version bump

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

3 files changed, 74 insertions, 12 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 8222d3275aa8..823dc6c11a89 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,12 @@
 # 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.111 2010/09/26 17:07:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.112 2010/09/27 00:26:39 tampakrap Exp $
+
+*qbittorrent-2.4.2 (27 Sep 2010)
+
+  27 Sep 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  +qbittorrent-2.4.2.ebuild:
+  Version bump
 
 *qbittorrent-2.4.1 (26 Sep 2010)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 36c4349ed2f1..c15da1b93d23 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST qbittorrent-2.2.11.tar.gz 2727964 RMD160 96e81471d0993c068b3b87c13ffa7b1d7d6ef3f2 SHA1 ef6c267acb3ff5b2a1c5951b2e6de88ce9b1f7ef SHA256 20a8b1c403048da89d73ce59ac95a8f2ffe2777c97f8f23bded63ac0027794d7
 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.0.tar.gz 3023363 RMD160 da8c605e7b8f85ecf358f903ce3bd8504abbdb2a SHA1 8cce406dab87e96f4472c13e20409483c04ed11f SHA256 a0b53bcbb77e6611f19a08c99744697a67bcb5df046aefb2b400c500dcf3e200
 DIST qbittorrent-2.4.1.tar.gz 2544488 RMD160 cee9eb407e8c4ee9bf8cddc3ea811266d113fa79 SHA1 d6274f2bd95b0fd1107c90e9836b55ba63d8c541 SHA256 1bf79997108ba4c7d5ad96c74e3f58e5a8131ce72eb0169950748c075b2300e0
+DIST qbittorrent-2.4.2.tar.gz 2544560 RMD160 4fbe95a24531ec9e6c82134592a4bc2d2594ec08 SHA1 0913e6e0e105da92a8b0a80dee3be30e795170eb SHA256 3faa39b3403ebab05df6c2df94fa15cf51059920ee46178100b2f1cc6c29b2d2
 EBUILD qbittorrent-2.2.11.ebuild 1681 RMD160 d9bc680590ce1751d5411b51aa82fec4c714195a SHA1 4884f7865d99778ba01835275022541ebfa4ca26 SHA256 cadc4893aff16dad7e93693bd9707ab1f7e61924b24dd357aa82fc8701237a82
 EBUILD qbittorrent-2.3.0.ebuild 1727 RMD160 0e4695e6d3054a8dcc6750f007991a34182cfe51 SHA1 69e84f34b6b1cd19e98181151ff0e7ea558fbc72 SHA256 2a6e599006cbbd04f2650be2c50cbbbc241297138f1a86adbad79f2098dba5ae
 EBUILD qbittorrent-2.3.1.ebuild 1727 RMD160 77912b295fcfde4b4c55082e3fbab9ccc2f5542c SHA1 5f9b8bbfe698ec1ee69f22f1204e2aeaad490d2d SHA256 c26e7ac5df1cc58def23937ef936a2709ee00378ad6e0a5331b91f6ab23a38d9
 EBUILD qbittorrent-2.4.0.ebuild 1747 RMD160 ae40ecdf569c8f99f039c006f05f1868c308a435 SHA1 12e6c9b0898d80f972e4a60581bd43375938de7f SHA256 c531342a179832d60e30abbebe7043a50f7c71382061d99fe85f0754b8d82afc
 EBUILD qbittorrent-2.4.1.ebuild 1747 RMD160 19705a4eaa3f8ef0eeb283efedc27b88cbe76872 SHA1 f1f1f7317ca2124bb7426e707a81917108cd677e SHA256 689be7ee11581860f0a9670b57e33cfd0e49c9680c54f42ea9b1efe57ae12465
-MISC ChangeLog 18947 RMD160 c08fff90bde3ea156e7242e8f6088b2117f2a148 SHA1 fc61a8aee40824d11dbcd518260073736247a214 SHA256 81a7aa265ad0429257b93d2d18715f805c0ebff739880069ee9c212000f347a7
+EBUILD qbittorrent-2.4.2.ebuild 1748 RMD160 f159b7f788ff875dcf6c9756bf8ca3ad46f9e32f SHA1 94c976bc7539468bac397e09313313315fa9060f SHA256 458ea7c9ff4cb2562f9fddece0216e737c02358c5e32ca1845f86eb551463c86
+MISC ChangeLog 19083 RMD160 83d629f9738894a8a436e21f8513f8aa82c69203 SHA1 0d001beae638f13da8b25046cbcc70120fa05272 SHA256 db91fa28a8add7185a3b0384cfe6e65ef1a32ae0d93e83e83d7fe9c222d88bb3
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyffV4ACgkQ9/cejkQaxBBavACfRWt/4cxCFUkmKpwY7sMl0nAC
-XlQAniHu/MmWxxat2/5d15EDanTVYkdR
-=ORgM
------END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.4.2.ebuild b/net-p2p/qbittorrent/qbittorrent-2.4.2.ebuild
new file mode 100644
index 000000000000..23c3765311da
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.4.2.ebuild
@@ -0,0 +1,64 @@
+# 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.2.ebuild,v 1.1 2010/09/27 00:26:39 tampakrap 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
+	x11-libs/qt-dbus: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
+}