[gentoo-commits] gentoo-x86 commit in net-p2p/qbittorrent: qbittorrent-9999.ebuild qbittorrent-3.0.11.ebuild ChangeLog

[Ben de Groot (yngwin)]

yngwin      13/07/31 15:33:00

  Modified:             qbittorrent-9999.ebuild ChangeLog
  Added:                qbittorrent-3.0.11.ebuild
  Log:
  Version bump, implementing latest eapi, python-r1.eclass, no longer slotted boost, and general cleanup; with thanks to contributors in bug #478840
  
  (Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)

Revision  Changes    Path
1.9                  net-p2p/qbittorrent/qbittorrent-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild?r1=1.8&r2=1.9

Index: qbittorrent-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qbittorrent-9999.ebuild	2 Mar 2013 23:09:45 -0000	1.8
+++ qbittorrent-9999.ebuild	31 Jul 2013 15:33:00 -0000	1.9
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.8 2013/03/02 23:09:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.9 2013/07/31 15:33:00 yngwin Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2"
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
 EGIT_REPO_URI="git://github.com/${PN}/qBittorrent.git
 https://github.com/${PN}/qBittorrent.git"
 
-inherit python qt4-r2 versionator git-2
+inherit python-r1 qt4-r2 git-2
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
@@ -19,25 +19,20 @@
 
 IUSE="dbus +X geoip"
 
-QT_MIN="4.6.1"
-# boost version so that we always have thread support
-CDEPEND="net-libs/rb_libtorrent
-	>=dev-qt/qtcore-${QT_MIN}:4
-	X? ( >=dev-qt/qtgui-${QT_MIN}:4 )
-	dbus? ( >=dev-qt/qtdbus-${QT_MIN}:4 )
-	dev-libs/boost"
+# python-2 is a runtime dep only, for the search engine (see INSTALL file)
+CDEPEND="dev-libs/boost
+	dev-qt/qtcore:4
+	net-libs/rb_libtorrent
+	X? ( dev-qt/qtgui:4 )
+	dbus? ( dev-qt/qtdbus:4 )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}
 	geoip? ( dev-libs/geoip )"
 
 DOCS="AUTHORS Changelog NEWS README TODO"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	# Respect LDFLAGS
 	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
@@ -50,13 +45,9 @@
 	use geoip     || myconf+=" --disable-geoip-database"
 	use dbus      || myconf+=" --disable-qt-dbus"
 
-	# 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"
+	./configure --prefix=/usr --qtdir=/usr \
+		--with-libboost-inc=/usr/include/boost \
+		${myconf} || die "configure failed"
 	eqmake4
 }



1.212                net-p2p/qbittorrent/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/ChangeLog?rev=1.212&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/ChangeLog?rev=1.212&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/ChangeLog?r1=1.211&r2=1.212

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- ChangeLog	17 Jul 2013 19:17:06 -0000	1.211
+++ ChangeLog	31 Jul 2013 15:33:00 -0000	1.212
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.211 2013/07/17 19:17:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.212 2013/07/31 15:33:00 yngwin Exp $
+
+*qbittorrent-3.0.11 (31 Jul 2013)
+
+  31 Jul 2013; Ben de Groot <yngwin@g.o> +qbittorrent-3.0.11.ebuild,
+  qbittorrent-9999.ebuild:
+  Version bump, implementing latest eapi, python-r1.eclass, no longer slotted
+  boost, and general cleanup; with thanks to contributors in bug #478840
 
   17 Jul 2013; Markus Meier <maekke@g.o> qbittorrent-3.0.9.ebuild:
   add ~arm, bug #473472



1.1                  net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.0.11.ebuild?rev=1.1&content-type=text/plain

Index: qbittorrent-3.0.11.ebuild
===================================================================
# Copyright 1999-2013 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.ebuild,v 1.1 2013/07/31 15:33:00 yngwin Exp $

EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7} )

inherit python-r1 qt4-r2

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 ~arm ~x86"
IUSE="dbus +X geoip"

# python-2 is a runtime dep only, for the search engine (see INSTALL file)
CDEPEND="dev-libs/boost
	dev-qt/qtcore:4
	>=net-libs/rb_libtorrent-0.16.3
	X? ( dev-qt/qtgui:4 )
	dbus? ( dev-qt/qtdbus:4 )"
DEPEND="${CDEPEND}
	virtual/pkgconfig"
RDEPEND="${CDEPEND}
	${PYTHON_DEPS}
	geoip? ( dev-libs/geoip )"

DOCS="AUTHORS Changelog NEWS README TODO"
S="${WORKDIR}/${MY_P}"

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 dbus 	  || myconf+=" --disable-qt-dbus"

	# econf fails, since this uses qconf
	./configure --prefix=/usr --qtdir=/usr \
		--with-libboost-inc=/usr/include/boost \
		${myconf} || die "configure failed"
	eqmake4
}