Version bump to 2.2.10 and 2.3.0_beta3

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

4 files changed, 74 insertions, 5 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 259cf706aaca..f05930ca24b9 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,14 @@
 # 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.91 2010/06/20 19:15:24 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.92 2010/06/26 23:35:58 hwoarang Exp $
+
+*qbittorrent-2.3.0_beta3 (26 Jun 2010)
+*qbittorrent-2.2.10 (26 Jun 2010)
+
+  26 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qbittorrent-2.2.10.ebuild, -qbittorrent-2.3.0_beta1.ebuild,
+  +qbittorrent-2.3.0_beta3.ebuild:
+  Version bump to 2.2.10 and 2.3.0_beta3
 
   20 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
   +files/moc_bug_workaround2.patch, qbittorrent-2.2.9-r1.ebuild:
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 1e1b6a086aae..32be30f5543b 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,21 +1,23 @@
 AUX moc_bug_workaround.patch 796 RMD160 b4b4d70bea959d0375ad753dfaa9afdf65ea5508 SHA1 4f8088ce859e2acf41e03ccb19e7efeda9044852 SHA256 3c99d404d5206fc1b320ab26a367f0e28bd1408fe56eacd4a86e05ec8aade36e
 AUX moc_bug_workaround2.patch 1313 RMD160 dc2a1b3dd336bf37c577b7e69beeedc61b546453 SHA1 b2722f7a2630ef69a5ad838672ca25f89f469a8a SHA256 147a1a04281c03f7ca721ad68aab7360f102267d667298a58f700d7b36ec17b0
 AUX nox-webui-fix.patch 2673 RMD160 349085981eee5e2deed5dce6e8b9557c07022ec7 SHA1 7a290fe64ee74a95bc3d97c6d2eef26cc459bad2 SHA256 ebe5d99aca9614c13a5b00c0b66aa2b189cce47acd1a1792665f6fc7430c8af4
+DIST qbittorrent-2.2.10.tar.gz 2729578 RMD160 bdac38aac89a1c264a831470080062d9a604e4e9 SHA1 10404235846161dfa6eaedffcb6e996c9b9bae49 SHA256 4ba5cea2711829c612922b1741490045f688548049e2d4da411b60da6f341a18
 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
 DIST qbittorrent-2.3.0beta2.tar.gz 2771868 RMD160 b10cd9dd9472090c77c2ab45d1b33afc30f17978 SHA1 9f13058b58cc4bf6ac7d03a5ef666cd72a332455 SHA256 51a14399622afdb992b6b8492576e0296c62cf6ffb7f58082d57e0d6cbb6a3a9
+DIST qbittorrent-2.3.0beta3.tar.gz 2747535 RMD160 af15e22b6249cc6af84789a52ac217451e1e154f SHA1 e72c767494a1656810a0f33008841debda78024a SHA256 60efc05e491e6b90243edd2b1998aadc1cc7f770c40f1817fb2b9e4ef64129c4
+EBUILD qbittorrent-2.2.10.ebuild 1685 RMD160 597471a12d9ec3cf7c6204cd04ffa930e60c1423 SHA1 0871751b2e3976daa1dd9d97ef50c6aa9c5ac3a8 SHA256 85845c8e83586cbb9bc6e3a930baeb00d3116bf97940eea481ab7f374c5ceb92
 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-r1.ebuild 1982 RMD160 0707ac2d2088301d011d84f52a975fe1683f2e99 SHA1 1ef4a73f83493fcb2cc1cbbb0bd4d5fd43b42b6c SHA256 dbd61e2e4802859d795c71458b390c7b7ba626dd1f304466106edaff5797844d
-EBUILD qbittorrent-2.3.0_beta1.ebuild 1733 RMD160 ff30289572603ec004dd35ce4de03b2ac2466e53 SHA1 66d4f31908eabfe505aa050b32ce716c8d1d1fc1 SHA256 ef74c04b1187cd974fb6b36e4ca8e5a17fd121f1dff0af8d0937cca802d0e5b6
 EBUILD qbittorrent-2.3.0_beta2.ebuild 1733 RMD160 9690a0f7d2b75cabe720314d35268fff22c558a8 SHA1 e20288cd6f1c09a96945a9dfb7cb89e5f9c89751 SHA256 a93e989dd7491c074f6f30d5592aecfa411bfab2799900e76ea1772b530d0b84
-MISC ChangeLog 15259 RMD160 1becc193058460dc839428f3a54a2a3dbfb2bf7a SHA1 e0f09e7b346ca9e69a919c9dc9a5daa0aabae3b2 SHA256 e0278e1b1d3719e05736a5b41865bde0c420d1ea72daa7d01dc6d03487686810
+EBUILD qbittorrent-2.3.0_beta3.ebuild 1733 RMD160 4af8edc44b4bfbbced93d8f48943c8d43e3b2920 SHA1 6a8fa83294edd1c74ebbdf2085d85ed1f014d93f SHA256 17ab4ab628e231c0a318fb60ada87efbf7c94a9998a49dddb9799727fc7a21e4
+MISC ChangeLog 15526 RMD160 5be201b1ef899926207f4b47e82c388b856440f8 SHA1 02a345452c89871ab5052fed03974e2619dd301c SHA256 1630bb4ffae9f3c99a332b204dadef0adecf405fe1ef110d0553e8ff4f3b1226
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.10.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.10.ebuild
new file mode 100644
index 000000000000..63b3ad6c6322
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.2.10.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.10.ebuild,v 1.1 2010/06/26 23:35:58 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_beta1.ebuild b/net-p2p/qbittorrent/qbittorrent-2.3.0_beta3.ebuild
index 17d77e1164a5..8b427881a7ff 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.3.0_beta1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.3.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # 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_beta1.ebuild,v 1.1 2010/06/02 14:27:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.3.0_beta3.ebuild,v 1.1 2010/06/26 23:35:58 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"