Version bump and new snapshot

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 155 insertions, 15 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 917547a934b3..f9aa52b99ce2 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.142 2011/03/04 19:56:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.143 2011/03/13 20:46:03 hwoarang Exp $
+
+*qbittorrent-2.7.0_beta4 (13 Mar 2011)
+*qbittorrent-2.6.8 (13 Mar 2011)
+
+  13 Mar 2011; Markos Chandras <hwoarang@gentoo.org> +qbittorrent-2.6.8.ebuild,
+  +qbittorrent-2.7.0_beta4.ebuild:
+  Version bump and new snapshot
 
   04 Mar 2011; Markos Chandras <hwoarang@gentoo.org>
   qbittorrent-2.7.0_beta2.ebuild, qbittorrent-9999.ebuild:
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 9fe2e17cec65..a44cfa0f7220 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -5,29 +5,33 @@ DIST qbittorrent-2.2.11.tar.gz 2727964 RMD160 96e81471d0993c068b3b87c13ffa7b1d7d
 DIST qbittorrent-2.4.11.tar.gz 2578039 RMD160 d2278bde471ccf031abc581a959c2726dd7cf91b SHA1 2b2ec1ec8a4009d8d924bae50c8b11cae5e75e1a SHA256 f6d863e7b20dcc7cb4c454b8e09e8633cbc2e7a0cd606c5972f2707b148d308b
 DIST qbittorrent-2.5.5.tar.gz 2819850 RMD160 b91d9ed0a355d87dbb5d0304026ad11af1e833ef SHA1 1bc5031887f80a5b3316a58bac9318e05fb69b3d SHA256 4a061bad1c9b4fd1a21508718a14c69fe9f03a85b19ee343bc18d187af380359
 DIST qbittorrent-2.6.7.tar.gz 2959334 RMD160 cb2ee41c44625604c9210eae11475c566ff32d9a SHA1 902ed9f2d8eab108eeeb135fecf635eadba4ef5a SHA256 4aa2734f64891c07c3def593f5bf3c4782e020e26f85147dd4b5e6f8a42b5cea
+DIST qbittorrent-2.6.8.tar.gz 2959756 RMD160 65611d3af2d1470d5bd70dad37654654b275594b SHA1 b0b7693ad2de280a6e6286b70c51ab0348caa858 SHA256 b25782ced6473d86fa9bcf7594348b39571ca42fb023bad901b4881c7d590433
 DIST qbittorrent-2.7.0beta2.tar.gz 3110786 RMD160 cd6a47fd01cde2d2075f49a39e33d422096203e3 SHA1 c88360e4b4afe4a77eb5088ad562439b5b9e69e3 SHA256 bee3d7fdb6601a92b2ecbe6cde5e5ecf10471cb5a03bfbeec2a0c4c36b92151d
+DIST qbittorrent-2.7.0beta4.tar.gz 3124040 RMD160 6a8d2efdeb2d6fcf04a95893f5b60dba28376eaf SHA1 741d3ee17899da1d630da90f10b0cdcd7b87fbcc SHA256 e0e04e3ae607157c4075142ef6ec4f7c85adaadc7aac6b881c7be173f51a5daa
 EBUILD qbittorrent-2.2.11.ebuild 1681 RMD160 d9bc680590ce1751d5411b51aa82fec4c714195a SHA1 4884f7865d99778ba01835275022541ebfa4ca26 SHA256 cadc4893aff16dad7e93693bd9707ab1f7e61924b24dd357aa82fc8701237a82
 EBUILD qbittorrent-2.4.11.ebuild 1748 RMD160 6a7506a9b097f90754ea2a284d77c99d4f604bbf SHA1 49f471f7b39283a3afdfa1b3f1ebce50bb8d9c93 SHA256 9c5511f4fe22cc45c62a530c12e07a95ce4ae65bd928bc71c75f99cde9951e0e
 EBUILD qbittorrent-2.5.5.ebuild 1747 RMD160 dd3af21cf1dfe296683f9c28703ac004df722886 SHA1 6291a1f1482c20b0ef517686af14862bdc98ae30 SHA256 4395f0944f9a51fd6ec0bf04366b5379845da8ebf3f193b2f60ee5d2a2787fce
 EBUILD qbittorrent-2.6.7.ebuild 1747 RMD160 5eb79aa747bc2960fab30d3c5c4286623cc3c144 SHA1 5a32172af43fbfc5b652904a219d71eda0990ff4 SHA256 29793a75e59d015ea5b270f4816b373de082188ef22798c2db68c540c07cee41
+EBUILD qbittorrent-2.6.8.ebuild 1747 RMD160 716b14ff0e9521799fcfa7faccd26d155416cfb7 SHA1 ccdcc7906c77e5561742beb6d7659a9d7f8cfae4 SHA256 f6ea91d5cdb7fc0c19fa8069dbff6b50b670f20423ab4878e1093fe0299b2e64
 EBUILD qbittorrent-2.7.0_beta2.ebuild 1816 RMD160 d770f041e01aff67b5706eff11539567c162491e SHA1 c07a09e518427d951b104204855182945357caf5 SHA256 1d9b5d692489c37926d274d6967be6755e36f15e0ce12f093d9dbb1479e27ebd
+EBUILD qbittorrent-2.7.0_beta4.ebuild 1816 RMD160 26d43db8f2a74f8c1cc95e5b307ac7248f5ce574 SHA1 ed4987efc1e3921e0268ce85d4e01bd1045401b7 SHA256 45e4bd49b58dce6a33bb1b05fd79c7ba070322cbd3c2cac7cd49de05058af4b8
 EBUILD qbittorrent-9999.ebuild 1801 RMD160 366e51be6029be4eee53baa16214bb867b279e34 SHA1 a89b4ff26588f0ae5cf2d9b7f7e3a9dee25a988c SHA256 f2ce9792a2768efb0025924e403046cc8fcf1b7429ef81b8f53c3d976d6260f6
-MISC ChangeLog 24785 RMD160 958f7e1790444c60c31615db21f5692a23e2ae4a SHA1 ae5edde9b0e4b88fa571d39b821af84fb4c23f37 SHA256 622107e59962a5ef303d64a454a7d34cfe1d1846b2e88ace9354c100ad7c88c5
+MISC ChangeLog 25006 RMD160 29996b7bead4632664df79b91097351642ce5d98 SHA1 0ca8f956e3a94961d0d0078e62a4ad557bd01378 SHA256 fb167255b6d5db930e0cf9511af4521e453aa762f92cad352b85068d9ad15d00
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNcUPXAAoJEPqDWhW0r/LCWpIP/0kHoL1U2P6mbtGYSIvYqk0D
-P/LzSEwX/oguTmV/DraIalOA+mfnLZX8QuWgIjhOr7/quIEJKs3VyjcToTDARCte
-j7aHsaZdKDjwOTV5WOYik5g+A2p5dWVoVLa4XEQx47aAYe+dqe2ZeOZdsUgqDJ1U
-LO6vWtdzQRDFU5+JcXHSbitnn4Frj8zNR2Ok+K+Cj+6NQtYuJbhjS5R3PzIYqfVL
-0Jt6nHFkJ5354h7MFj4IMhM2ZRZ+MV3gjFRH8KVwVJTICASOaKWn/nmyqTiUGTIv
-QuiWLfrPmpaqVpW+0WLR1N/94LBX2XS9yb1+NpLY5w0MqD98mGWruUQxXm0GIBKb
-FBicQgTqX745JIilG9vHJnkfAzzBqNLxgpobm516CFISuxAgQuqpf3GPWUf6ez24
-MbyvFVlONwHiCovvTKUIJHHl6cXYGGBv4NPsdp6OgYKd6HFTOusOJOoOt3W8Ed77
-PpupKkvnP86N2IiUkFevXJ50MFzXjxeBV+RZVM0sYZsigbAVwTlttkxvhCjWGy+f
-7boNzh6Gr90nM33JwMPoCY7sdLHqlXTk44TsmPdnO1WcIV/C5ApLgai3w020JUGW
-fHDNy3mxrssFb9Eah6kqGSDhfzDX0JvjPUBRyIlAICbco/ehfqkGwVulLcqaUT+q
-9H1MVzcPIVNSLKeVFbXz
-=iK7y
+iQIcBAEBCgAGBQJNfSzLAAoJEPqDWhW0r/LCiaMQAJHydyUX8xvLTNP6RpnHWrHw
+Dj+YVETp0XRI3+Cj/byJNOeqGYA/gK6Ch4Xi+jpkSnQ/A2U66hGDW8u0Sqnhoxy5
+wSZPPVuL+iKHpTet3+vwfmS3eUCY5efMXU9TDw4HQz9rROpTBKA9J5xYIAJJud3W
+hdJzJZXK2qUzCu0+7YqB8oNLG68IwmI+6OQd60DPp36hR2mUYNucPPhyFFOiBZ0U
+x4w0A/emf4sOor9dY3AALlEhie47C6Mwpqp/snk0DWR/1vxdn9W5MtxOC8Kq+6no
+UUZKy6HGRCdxJ/LR/mm8RoFqWLZKKAlWKq/z74dGQfFhyDNyviaRtZTG0Sy/NbiB
+8cGlsiSvxcLBGHXofoVl6Yzt66RhvGV0BDUYhuhCdCEf989XevmNh6EV9Kv5ieVh
+xI1o7oTdSGLUieVyfIaJkgRfp9cDThgb8IJPQx6q5E18HH57NsgktRaLuc2zwLKE
+CrUoZgz60BEC7UV0HCs0qICIoLmVE/PGzujKrvvZde2W0juL+D/L8tFEpS2AbW1Z
+UFb1H/4s//I8JlMjdk9Dvt+QzhLuYmpVWWDPu9jJUUjHZM22zgz2HIUyllGgtSYR
+aTc/q2qlY55sNchtHepo5JPcPL+ygB4BAp6wY+wS2U+BxSWR6QFKMrq/zsguscxq
+Wskmb2AV4IHmL0mldYFL
+=tkcu
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.6.8.ebuild b/net-p2p/qbittorrent/qbittorrent-2.6.8.ebuild
new file mode 100644
index 000000000000..e5806e2eb500
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.6.8.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.6.8.ebuild,v 1.1 2011/03/13 20:46:03 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
+	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
+}
diff --git a/net-p2p/qbittorrent/qbittorrent-2.7.0_beta4.ebuild b/net-p2p/qbittorrent/qbittorrent-2.7.0_beta4.ebuild
new file mode 100644
index 000000000000..aa87c2089279
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-2.7.0_beta4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.7.0_beta4.ebuild,v 1.1 2011/03/13 20:46:03 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"
+
+QT_MIN="4.7.1"
+# boost version so that we always have thread support
+CDEPEND="net-libs/rb_libtorrent
+	>=x11-libs/qt-core-${QT_MIN}:4
+	>=x11-libs/qt-dbus-${QT_MIN}:4
+	X? ( >=x11-libs/qt-gui-${QT_MIN}:4
+		libnotify? ( >=x11-libs/qt-gui-${QT_MIN}: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
+}