qbittorrent releases do not work with rb_libtorrent-1.0

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)

6 files changed, 12 insertions, 118 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index d7a755427452..cb9c1d6c09d4 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.244 2015/04/19 09:27:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.245 2015/04/19 09:32:45 hwoarang Exp $
+
+  19 Apr 2015; Markos Chandras <hwoarang@gentoo.org> -qbittorrent-3.1.10.ebuild,
+  -qbittorrent-3.1.11.ebuild, qbittorrent-3.0.11-r2.ebuild,
+  qbittorrent-3.1.12.ebuild, qbittorrent-3.1.9.2-r1.ebuild:
+  qbittorrent releases do not work with rb_libtorrent-1.0
 
   19 Apr 2015; Markos Chandras <hwoarang@gentoo.org> qbittorrent-9999.ebuild:
   A bit of cleanup and sync with regular ebuilds
diff --git a/net-p2p/qbittorrent/qbittorrent-3.0.11-r2.ebuild b/net-p2p/qbittorrent/qbittorrent-3.0.11-r2.ebuild
index 62c93828fb59..6cff5beecfdb 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.0.11-r2.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.0.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.11-r2.ebuild,v 1.2 2015/04/08 18:17:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.11-r2.ebuild,v 1.3 2015/04/19 09:32:45 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,6 +24,7 @@ CDEPEND="
 	dev-qt/qtcore:4
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
 	>=net-libs/rb_libtorrent-0.16.17
+	<net-libs/rb_libtorrent-1.0.0
 	dbus? ( dev-qt/qtdbus:4 )
 	X? ( dev-qt/qtgui:4 )
 "
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild
deleted file mode 100644
index a7ec482a306d..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.10.ebuild,v 1.3 2015/04/08 18:17:51 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 qt4-r2
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="http://www.qbittorrent.org/"
-MY_P=${P/_}
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="dbus debug geoip +X"
-
-# geoip and python are runtime deps only (see INSTALL file)
-CDEPEND="
-	dev-libs/boost:=
-	dev-qt/qtcore:4
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
-	>=net-libs/rb_libtorrent-0.16.17
-	dbus? ( dev-qt/qtdbus:4 )
-	X? ( dev-qt/qtgui:4 )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	geoip? ( dev-libs/geoip )
-"
-
-S=${WORKDIR}/${MY_P}
-DOCS=(AUTHORS Changelog README.md TODO)
-
-src_configure() {
-	# Custom configure script, econf fails
-	local myconf=(
-		./configure
-		--prefix="${EPREFIX}/usr"
-		--with-libboost-inc="${EPREFIX}/usr/include/boost"
-		--with-qtsingleapplication=system
-		$(use dbus  || echo --disable-qt-dbus)
-		$(use debug && echo --enable-debug)
-		$(use geoip || echo --disable-geoip-database)
-		$(use X     || echo --disable-gui)
-	)
-
-	echo "${myconf[@]}"
-	"${myconf[@]}" || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.11.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.11.ebuild
deleted file mode 100644
index f919036d7a85..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.11.ebuild,v 1.2 2015/04/08 18:17:51 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 qt4-r2
-
-DESCRIPTION="BitTorrent client in C++ and Qt"
-HOMEPAGE="http://www.qbittorrent.org/"
-MY_P=${P/_}
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="dbus debug geoip +X"
-
-# geoip and python are runtime deps only (see INSTALL file)
-CDEPEND="
-	dev-libs/boost:=
-	dev-qt/qtcore:4
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
-	>=net-libs/rb_libtorrent-0.16.17
-	dbus? ( dev-qt/qtdbus:4 )
-	X? ( dev-qt/qtgui:4 )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	geoip? ( dev-libs/geoip )
-"
-
-S=${WORKDIR}/${MY_P}
-DOCS=(AUTHORS Changelog README.md TODO)
-
-src_configure() {
-	# Custom configure script, econf fails
-	local myconf=(
-		./configure
-		--prefix="${EPREFIX}/usr"
-		--with-libboost-inc="${EPREFIX}/usr/include/boost"
-		--with-qtsingleapplication=system
-		$(use dbus  || echo --disable-qt-dbus)
-		$(use debug && echo --enable-debug)
-		$(use geoip || echo --disable-geoip-database)
-		$(use X     || echo --disable-gui)
-	)
-
-	echo "${myconf[@]}"
-	"${myconf[@]}" || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild
index 9b1faefd54f8..5b9fc0c5d7de 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild,v 1.3 2015/04/08 18:17:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.12.ebuild,v 1.4 2015/04/19 09:32:45 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,6 +24,7 @@ CDEPEND="
 	dev-qt/qtcore:4
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
 	>=net-libs/rb_libtorrent-0.16.17
+	<net-libs/rb_libtorrent-1.0.0
 	dbus? ( dev-qt/qtdbus:4 )
 	X? ( dev-qt/qtgui:4 )
 "
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild
index f64a7ef4c832..503b8005b32d 100644
--- a/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild,v 1.5 2015/04/08 18:17:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild,v 1.6 2015/04/19 09:32:45 hwoarang Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,6 +24,7 @@ CDEPEND="
 	dev-qt/qtcore:4
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
 	>=net-libs/rb_libtorrent-0.16.17
+	<net-libs/rb_libtorrent-1.0.0
 	dbus? ( dev-qt/qtdbus:4 )
 	X? ( dev-qt/qtgui:4 )
 "