Version bump. Drop conf.pri hack, as the correct values are now detected from the arguments we pass to configure. Fixes bug #313811.

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

3 files changed, 67 insertions, 12 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 9d6d1b62aee4..9ae6eadcdf3a 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.78 2010/04/08 12:35:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.79 2010/04/10 16:14:48 yngwin Exp $
+
+*qbittorrent-2.2.5 (10 Apr 2010)
+
+  10 Apr 2010; Ben de Groot <yngwin@gentoo.org> +qbittorrent-2.2.5.ebuild:
+  Version bump. Drop conf.pri hack, as the correct values are now detected
+  from the arguments we pass to configure. Fixes bug #313811.
 
   08 Apr 2010; Christian Faulhammer <fauli@gentoo.org>
   qbittorrent-2.2.2.ebuild:
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index c1ea49891c4d..314336643a1a 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST qbittorrent-2.1.2.tar.gz 2373105 RMD160 f358633b2f380f24ecfa8804b506e1539061fd51 SHA1 e5c21c4c9e4f001efcdf34be62909d942da81ce7 SHA256 f58e4e56f5c8657f8d1e24611a52545ad56b3e2a821cdc48e1520c26f9e35dc7
 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
 EBUILD qbittorrent-2.1.2.ebuild 1336 RMD160 a8f555604c275ef1e588734cc23312d613c9b1d9 SHA1 9e6f67955d30db965e27db82836e03f64ba6eb0b SHA256 5c5b4b125951196e6208cd46c38949ccfc59ab146eb1a9a495ec0035959d9f6b
 EBUILD qbittorrent-2.2.2.ebuild 1743 RMD160 fce387edeeba4848cb8b222c65853a209516ce74 SHA1 67cc436e259c5818990d87a28f5ea7eecaea5148 SHA256 97eefc4e4ce5a3d64838620950efcdc443f3f304679da36bdc25af49c82f2801
-MISC ChangeLog 13088 RMD160 b0a056476ca70ac26c56871759c58bb965d176a1 SHA1 297705d36f1ec5f3dcb39b1c9504ae62e3282bc9 SHA256 b79cd3c8eaee79fb60052a7d7203e34a4bf0b1a4cd3c4b970b5c161551dc3bf7
+EBUILD qbittorrent-2.2.5.ebuild 1642 RMD160 8091a7b960f1f4b0c67de67d55d5f2572bc50201 SHA1 2ffb6d812db78a376d4ae936008d2c83e5fe26aa SHA256 f240feac8c19022d7d105b5431f5552080c40288b792df473a5ec84d20b96336
+MISC ChangeLog 13336 RMD160 3173159e599b55ebf6a91997b9e3732ab9276e63 SHA1 be3a996df92222fd11f4753c0c958f4bea165ec4 SHA256 5d1dd3776fe4ea54a3508bd16db91784989953c0a73983269f1175a0bcad779d
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAku9zbQACgkQNQqtfCuFneMcmACdE3XkzopY5q7kP3nYri+e/rxj
-Rq0AmwUY6OpA6jRmDof9xurdZU95MeU0
-=fDVT
------END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.2.5.ebuild b/net-p2p/qbittorrent/qbittorrent-2.2.5.ebuild
new file mode 100644
index 000000000000..ad95ee600a9a
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.2.5.ebuild
@@ -0,0 +1,57 @@
+# 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.5.ebuild,v 1.1 2010/04/10 16:14:48 yngwin Exp $
+
+EAPI="2"
+inherit 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-1.34.1"
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${CDEPEND}
+	>=dev-lang/python-2.3
+	geoip? ( dev-libs/geoip )
+	libnotify? ( x11-libs/libnotify )"
+
+DOCS="AUTHORS Changelog NEWS README TODO"
+
+pkg_setup() {
+	confutils_use_depend_all libnotify X
+}
+
+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
+}