Version bump, remove rc releases

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 9 insertions, 65 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 17518a772083..8df4e4b8fa2e 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,13 @@
 # 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.101 2010/07/22 17:07:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.102 2010/07/28 22:35:59 hwoarang Exp $
+
+*qbittorrent-2.3.0 (28 Jul 2010)
+
+  28 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  -qbittorrent-2.3.0_rc4.ebuild, -qbittorrent-2.3.0_rc7.ebuild,
+  +qbittorrent-2.3.0.ebuild:
+  Version bump, remove rc releases
 
 *qbittorrent-2.3.0_rc7 (22 Jul 2010)
 *qbittorrent-2.2.11 (22 Jul 2010)
diff --git a/net-p2p/qbittorrent/qbittorrent-2.3.0_rc4.ebuild b/net-p2p/qbittorrent/qbittorrent-2.3.0.ebuild
index 25bed66bac8e..005e59af10c0 100644
--- a/net-p2p/qbittorrent/qbittorrent-2.3.0_rc4.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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_rc4.ebuild,v 1.1 2010/07/17 23:18:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-2.3.0.ebuild,v 1.1 2010/07/28 22:35:59 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
diff --git a/net-p2p/qbittorrent/qbittorrent-2.3.0_rc7.ebuild b/net-p2p/qbittorrent/qbittorrent-2.3.0_rc7.ebuild
deleted file mode 100644
index 33a93a45038a..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-2.3.0_rc7.ebuild
+++ /dev/null
@@ -1,63 +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.3.0_rc7.ebuild,v 1.1 2010/07/22 17:07:38 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
-}