Version bump

(Portage version: 2.1.9.26/cvs/Linux x86_64)

4 files changed, 14 insertions, 70 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/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"