Version bump. Fixes bug #322173. Thanks to Michael Weber <gentoo@xmw.de> for the...

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

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 4bac5870a4e0beb5c92f61d0a4b68e56e8d9a85b..0d68fdd594a77cbc557040218d5c532064fd87dc 100644 (file)
--- 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.85 2010/05/31 11:53:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.86 2010/06/02 14:27:35 hwoarang Exp $
+
+*qbittorrent-2.3.0_beta1 (02 Jun 2010)
+*qbittorrent-2.2.8 (02 Jun 2010)
+
+  02 Jun 2010; Markos Chandras <hwoarang@gentoo.org>
+  +qbittorrent-2.2.8.ebuild, +qbittorrent-2.3.0_beta1.ebuild:
+  Version bump. Fixes bug #322173. Thanks to Michael Weber <gentoo@xmw.de>
+  for the patch
 
   31 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   qbittorrent-2.2.6.ebuild:

diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index dcd58cad8cf4b5d5d617ea9af8d112ea3b5d90ef..0395697535bcf89007e1da6fe6273d39e45bfdff 100644 (file)
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -2,9 +2,13 @@ DIST qbittorrent-2.2.2.tar.gz 2498865 RMD160 c9ff7b7ac51ab1f0bf439205a69cae99a44
 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.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
-MISC ChangeLog 14121 RMD160 7697a8457d633980674be6738544b9ecee0e1ddb SHA1 672680bf7937e9787e89cf1d4055c350b3f55b40 SHA256 152e7f13e6e7993c5e01cbb5ba959ecbbf6e65c08f944ea874b7a6523023765d
+EBUILD qbittorrent-2.2.8.ebuild 1684 RMD160 f3f1f3493bfb5625f49a2ae01107af6e0be9246d SHA1 cea4413f886076683c7f500c8d7e16db8797e024 SHA256 815f85ad12645ee9004ae95d7c12ec7bbba7be232d50fdb59e33872e04c545cf
+EBUILD qbittorrent-2.3.0_beta1.ebuild 1733 RMD160 ff30289572603ec004dd35ce4de03b2ac2466e53 SHA1 66d4f31908eabfe505aa050b32ce716c8d1d1fc1 SHA256 ef74c04b1187cd974fb6b36e4ca8e5a17fd121f1dff0af8d0937cca802d0e5b6
+MISC ChangeLog 14399 RMD160 b8a38796b95587182d2f3a0d882be17116ae50b8 SHA1 86a8f541bfc713024b71a1827ec1eb15104c5dce SHA256 215cb6352da64905d2c89fd36883811e42f62a171a43eb3767a67172ec61e37c
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c

diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.8.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.8.ebuild
new file mode 100644 (file)
index 0000000..ec75297
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.2.8.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.8.ebuild,v 1.1 2010/06/02 14:27:35 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_beta1.ebuild
new file mode 100644 (file)
index 0000000..17d77e1
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.3.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.3.0_beta1.ebuild,v 1.1 2010/06/02 14:27: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
+}