Version bump

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

4 files changed, 97 insertions, 2 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 5b912c624cfa..16d8da095767 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.87 2010/06/12 10:12:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.88 2010/06/17 09:45:51 hwoarang Exp $
+
+*qbittorrent-2.2.9 (17 Jun 2010)
+
+  17 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qbittorrent-2.2.9.ebuild, +files/moc_bug_workaround.patch:
+  Version bump
 
   12 Jun 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Taking over maintainership
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index ecc78b1f6245..18f848609504 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,14 +1,17 @@
+AUX moc_bug_workaround.patch 796 RMD160 b4b4d70bea959d0375ad753dfaa9afdf65ea5508 SHA1 4f8088ce859e2acf41e03ccb19e7efeda9044852 SHA256 3c99d404d5206fc1b320ab26a367f0e28bd1408fe56eacd4a86e05ec8aade36e
 DIST qbittorrent-2.2.2.tar.gz 2498865 RMD160 c9ff7b7ac51ab1f0bf439205a69cae99a44ab27d SHA1 cb12f934f6c61c78f71b7afce065442d77e6dc9c SHA256 9750ae4c384f0b283f9185722fdb1206148438132c5f44b094c6b0e697c5711d
 DIST qbittorrent-2.2.5.tar.gz 2504251 RMD160 3e54e49bf877778b00d6c26c73bb8a66a8a17a4c SHA1 a7568c220d1e5ed3113c6be861bab4422ef5343a SHA256 461f1b8f38c3ca8d769e7d628ec897adc1cc1f81b43e36e1bcd3847dfe382f2d
 DIST qbittorrent-2.2.6.tar.gz 2557087 RMD160 a00dd9dc45523474bcd60c26acf7917f8e2891c9 SHA1 06db1b922e038659ea04f8e1030d4131dd82bfc4 SHA256 c24b4b9f89ef7420a15a49f2b84b9c45bbc53f71fee774d9da768874e97915ba
 DIST qbittorrent-2.2.7.tar.gz 2603968 RMD160 fa481a92af81f085c427fdb0434425d73f04c64b SHA1 b36dce6864b608967746496bc79498afa21df6d0 SHA256 51f6fbbb912944cad292db86b55202b121549dc88b7ea729139cedb5da0fb73b
 DIST qbittorrent-2.2.8.tar.gz 2603947 RMD160 1e74f4fcbcbc7e5d2310833115edf282ece73638 SHA1 6b2e8f1ab903c68516d16866bdf0579da689362c SHA256 49f2ad035f1eb9b3d2c7ca10b3539dfb7fb07db1f2eef8b41ef6223ceb734c81
+DIST qbittorrent-2.2.9.tar.gz 2725086 RMD160 7cb972ec6e6cee19f6ec67207a5a152e111ca34c SHA1 40d5479271edd4ab984e5b0193f77f5562dae90a SHA256 eec379f6009cc5a8365dbff2476c748702784d15e61cf0aa1b3239d9b749435d
 DIST qbittorrent-2.3.0beta1.tar.gz 2648464 RMD160 3d4511434d7d1ebb32c8e73cb6592b07cc2669ba SHA1 081a96015e367627650457c326f4bb2a57641167 SHA256 72316751813d71168f4ff9c9ff7047b7d30822e897ad5e979060b323c4e06c45
 EBUILD qbittorrent-2.2.2.ebuild 1745 RMD160 251b19c42743185533842289f0243d49aefd4528 SHA1 0516dceae40495d0ebe108782ed00a89a9a3d40b SHA256 1fb821e4043020ecfb40a87ad46db4ea07f4222fd16d406f30b7532bb2c678fe
 EBUILD qbittorrent-2.2.5.ebuild 1642 RMD160 8091a7b960f1f4b0c67de67d55d5f2572bc50201 SHA1 2ffb6d812db78a376d4ae936008d2c83e5fe26aa SHA256 f240feac8c19022d7d105b5431f5552080c40288b792df473a5ec84d20b96336
 EBUILD qbittorrent-2.2.6.ebuild 1644 RMD160 2f0d53fe978d64e59451cdbb35dbaf475410cb53 SHA1 47c445cae4442ae1900a917e2fe6ad5f93b628a7 SHA256 37923ca31aec8e09fa108b9ff5bff773f4b681f05cf08656ee0723d1a41e11f2
 EBUILD qbittorrent-2.2.7.ebuild 1644 RMD160 fba816796d2be19657865822ffebf7574d707942 SHA1 9bc1641d8e37cc44cc16b33c6acf249bc8ac6927 SHA256 32495a6225e4e561f8e99ed7ff88d82fa5e778af6d4f6cfa9602e6a21c6b4938
 EBUILD qbittorrent-2.2.8.ebuild 1684 RMD160 f3f1f3493bfb5625f49a2ae01107af6e0be9246d SHA1 cea4413f886076683c7f500c8d7e16db8797e024 SHA256 815f85ad12645ee9004ae95d7c12ec7bbba7be232d50fdb59e33872e04c545cf
+EBUILD qbittorrent-2.2.9.ebuild 1837 RMD160 938eaaf43198d627eb88b9aefdd6abbbfd33a223 SHA1 593471aba998fa534979bbecd608099b040453d4 SHA256 a3b290325704944276bbbac7c289d60dcdd29363018d77d4e6ee923daa7995c3
 EBUILD qbittorrent-2.3.0_beta1.ebuild 1733 RMD160 ff30289572603ec004dd35ce4de03b2ac2466e53 SHA1 66d4f31908eabfe505aa050b32ce716c8d1d1fc1 SHA256 ef74c04b1187cd974fb6b36e4ca8e5a17fd121f1dff0af8d0937cca802d0e5b6
-MISC ChangeLog 14496 RMD160 918643c6644fa18cece7eaa1f18c9d3d687cbdd6 SHA1 c62caa13393cad5359e49002e727caebde2077cf SHA256 941e0046110adb05da47f4390f3b1dc1fd59b42d2469bd790a7b57a9b40ad392
+MISC ChangeLog 14661 RMD160 ed2771bc9df5c28c6b55dfa2859023a66510eafa SHA1 afa458359a37bb7e614041ee309db535fdd307cf SHA256 2b66b3e653b3b55cd1f4ce13f48ca5b579a3d45ff5d555024965fa25fb63299c
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
diff --git a/net-p2p/qbittorrent/files/moc_bug_workaround.patch b/net-p2p/qbittorrent/files/moc_bug_workaround.patch
new file mode 100644
index 000000000000..f01eadb5eaac
--- /dev/null
+++ b/net-p2p/qbittorrent/files/moc_bug_workaround.patch
@@ -0,0 +1,24 @@
+Index: src/bittorrent.h
+===================================================================
+--- src/bittorrent.h	(revision 4095)
++++ src/bittorrent.h	(working copy)
+@@ -118,6 +118,9 @@
+   bool useTemporaryFolder() const;
+   QString getDefaultSavePath() const;
+   ScanFoldersModel* getScanFoldersModel() const;
++#if LIBTORRENT_VERSION_MINOR < 15
++  void saveDHTEntry();
++#endif
+ 
+ public slots:
+   QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
+@@ -136,9 +139,6 @@
+   void resumeTorrent(QString hash);
+   void resumeAllTorrents();
+   /* End Web UI */
+-#if LIBTORRENT_VERSION_MINOR < 15
+-  void saveDHTEntry();
+-#endif
+   void preAllocateAllFiles(bool b);
+   void saveFastResumeData();
+   void enableIPFilter(QString filter);
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.9.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.9.ebuild
new file mode 100644
index 000000000000..a96f298bc96e
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.2.9.ebuild
@@ -0,0 +1,62 @@
+# 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.9.ebuild,v 1.1 2010/06/17 09:45:51 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() {
+	# Move saveDHTEntry definition away from slots so the moc
+	# doens't get confused and breaks compilation
+	epatch "${FILESDIR}"/moc_bug_workaround.patch
+	# 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
+}