Version bump

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

5 files changed, 22 insertions, 80 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 52e88c05e550..35c84b560bb1 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.130 2010/12/29 21:22:59 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.131 2011/01/02 00:23:14 hwoarang Exp $
+
+*qbittorrent-2.6.0_beta4 (02 Jan 2011)
+*qbittorrent-2.5.3 (02 Jan 2011)
+
+  02 Jan 2011; Markos Chandras <hwoarang@gentoo.org> -qbittorrent-2.5.1.ebuild,
+  -qbittorrent-2.5.2.ebuild, +qbittorrent-2.5.3.ebuild,
+  -qbittorrent-2.6.0_beta3.ebuild, +qbittorrent-2.6.0_beta4.ebuild:
+  Version bump
 
 *qbittorrent-2.6.0_beta3 (29 Dec 2010)
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 6afc7eb16114..ae0ee9fda773 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -3,21 +3,19 @@ Hash: SHA1
 
 DIST qbittorrent-2.2.11.tar.gz 2727964 RMD160 96e81471d0993c068b3b87c13ffa7b1d7d6ef3f2 SHA1 ef6c267acb3ff5b2a1c5951b2e6de88ce9b1f7ef SHA256 20a8b1c403048da89d73ce59ac95a8f2ffe2777c97f8f23bded63ac0027794d7
 DIST qbittorrent-2.4.11.tar.gz 2578039 RMD160 d2278bde471ccf031abc581a959c2726dd7cf91b SHA1 2b2ec1ec8a4009d8d924bae50c8b11cae5e75e1a SHA256 f6d863e7b20dcc7cb4c454b8e09e8633cbc2e7a0cd606c5972f2707b148d308b
-DIST qbittorrent-2.5.1.tar.gz 2812556 RMD160 7fcc0fc976b9ffd4e6f8d5ef525f0b5953667ac9 SHA1 05ff3ad54485baaf28dd26e35d9e5c352f83fe59 SHA256 d9b6d572b0a6e3466cd42b03d8df3075b21841dca512c0e7e0a45bf11900d31c
-DIST qbittorrent-2.5.2.tar.gz 2818217 RMD160 f496a80d87d9a6bccceb79f705736b27438c4a55 SHA1 98b2e74c722ffe333a495182e3bef5b146f8c728 SHA256 bc1dae1a02a73c9adff26a990e928c1d1e3c39f6ce9cf9546c55d8ba81ada77d
-DIST qbittorrent-2.6.0beta3.tar.gz 2794651 RMD160 d913687089c4ad976f115f0f67380a65e6a4f0da SHA1 1f5e6a096ba2ef8fc27c4e532ba784f2e487b1c9 SHA256 208ba7ed82a7a401ea4a80658675944d38da44877c98e62f7bfe890e16073c2d
+DIST qbittorrent-2.5.3.tar.gz 2819422 RMD160 3d6f292b91866dda10667d0090325775c005d34c SHA1 522726d46f68e8f7ff3f467441ad4ce4b80f28e6 SHA256 c1ea426a8c94e6042a8421c5a38cb79bcef0bf1dc1ba639c151e753e8bf40029
+DIST qbittorrent-2.6.0beta4.tar.gz 2801961 RMD160 32d300160cfc1edb7c2da4c181a6445368d55612 SHA1 40d566a93846799fd91f0f716a7573083089b7cf SHA256 37f42bde31d8f1f0755470a074cc75283f4024628a0650115f38db522cd763e3
 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.1.ebuild 1747 RMD160 a53941cc4b49cdc7dd6ff7d47ee6e58f71e926c0 SHA1 638fa282380eb74c0d3c0dfd15f2ceddb13af637 SHA256 acb4ccaef8d07e4d3c2e8d841d370ba0be6897bd41c801c96d5b85b4dc856e3a
-EBUILD qbittorrent-2.5.2.ebuild 1747 RMD160 87bd4091e3819126777856e8568b8ac9f9c73761 SHA1 2d26b33cba0ab54bb8c0f49df15b667818e155ae SHA256 eb38c91d0622496e9ef609bdfdbc303ed83d84322c37c5a14955f8405089c8ec
-EBUILD qbittorrent-2.6.0_beta3.ebuild 1753 RMD160 09a90ad07607e073e50ca28a203861a411a8202c SHA1 0c74e994770c74b5172ac86ec69c593ef9ceff84 SHA256 3884e656977741db8542c4f0a8bc5d771664e5088fa87861b88046148783b4c6
+EBUILD qbittorrent-2.5.3.ebuild 1747 RMD160 782007b8bbf95bc65daa4f368f98f1e7457f4ae0 SHA1 906ed8dd5a108de50b1d09940fce5776f35545f3 SHA256 e7124471792141fd4f6031027d5304d8ecd93d29c1c973b01a1a490c844797c7
+EBUILD qbittorrent-2.6.0_beta4.ebuild 1753 RMD160 b6c7487d64ad72d90de08d20cb5507fb9eefb6fa SHA1 f43a00f334098e387806636a929a13eec4c02886 SHA256 85d2ca60801c9fc64ccc8b23272548ce9cf2de7a3dc06b0f17940de613c77abf
 EBUILD qbittorrent-9999.ebuild 1738 RMD160 dc75affd777166f0b778a1e20ac1789a6e65fb5b SHA1 f96260d15cebc1a2a37bf56052e6fe4e1173ff90 SHA256 ff765d43f6254847e1179403428f41f0e0bdb134c2e521050883c7ee5f822b7b
-MISC ChangeLog 22537 RMD160 72e1a1d83da96a0187bcd44bdde2a102292ec546 SHA1 057099f99d46c9efd03dd0bfe527c4e540b9ba6b SHA256 9a10afc1b91c4462e92ab6e7402a1929b845566a9030e942e418751e92243054
+MISC ChangeLog 22830 RMD160 219e1e4db6c9aa322927c1af5be958286e05f6f1 SHA1 03ddaa5ac9f6f77ad5ddbb7a8715366b43ffd2ea SHA256 2de4cfa84e53ac8b64a85ba284056b576a903016c2142e10d3d5d54940cb1845
 MISC metadata.xml 280 RMD160 25c947a1034c150a136911351c7da9ed8783ee44 SHA1 17a16b5a0ddc3de88d81a1493cd5cb4c1aa795aa SHA256 07e3116f2c52c06760e21dc1b8bd3b318b7d9a140fb1b8942736aedd0d750b73
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEUEARECAAYFAk0bpm0ACgkQ9/cejkQaxBCJQwCXeNNSl7IG42uj66CM9rUXnuhC
-RQCfc9jzHA/5gqGiqaHct0I850iytxY=
-=o/67
+iEYEARECAAYFAk0fxSkACgkQ9/cejkQaxBD3hwCfa2UG8PSeOezmROsIjd1sUIfq
+XtMAniWZ14lq9SKqRQIEwFBbFI/+VuMB
+=5lyi
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/qbittorrent/qbittorrent-2.5.1.ebuild b/net-p2p/qbittorrent/qbittorrent-2.5.3.ebuild
index 2a441d73a7eb..81458d5db6c1 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.5.1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5.1.ebuild,v 1.1 2010/12/06 19:48:34 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.5.3.ebuild,v 1.1 2011/01/02 00:23:14 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
diff --git a/net-p2p/qbittorrent/qbittorrent-2.6.0_beta3.ebuild b/net-p2p/qbittorrent/qbittorrent-2.6.0_beta3.ebuild
deleted file mode 100644
index 332dffda5575..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-2.6.0_beta3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.6.0_beta3.ebuild,v 1.1 2010/12/29 21:22:59 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.5.2.ebuild b/net-p2p/qbittorrent/qbittorrent-2.6.0_beta4.ebuild
index 22f7d6d4b19f..9212b3127bc0 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.5.2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.6.0_beta4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.5.2.ebuild,v 1.1 2010/12/20 13:22:53 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.6.0_beta4.ebuild,v 1.1 2011/01/02 00:23:14 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"