Depend on latest qtsingleapplication in order to fix bug 507998. Several ebuild enhancements. Remove old versions.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

12 files changed, 100 insertions, 477 deletions

diff --git a/net-p2p/qbittorrent/ChangeLog b/net-p2p/qbittorrent/ChangeLog
index 1515b29c264e..5c41d99ab0b1 100644
--- a/net-p2p/qbittorrent/ChangeLog
+++ b/net-p2p/qbittorrent/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-p2p/qbittorrent
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.229 2014/05/07 19:38:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/ChangeLog,v 1.230 2014/05/24 22:53:34 pesa Exp $
+
+*qbittorrent-3.1.9.2-r1 (24 May 2014)
+
+  24 May 2014; Davide Pesavento <pesa@gentoo.org>
+  +qbittorrent-3.1.9.2-r1.ebuild, -qbittorrent-2.9.7.ebuild,
+  -qbittorrent-3.0.11-r1.ebuild, -qbittorrent-3.1.3.ebuild,
+  -qbittorrent-3.1.4.ebuild, -qbittorrent-3.1.5.ebuild,
+  -qbittorrent-3.1.8.ebuild, -qbittorrent-3.1.9.2.ebuild,
+  -qbittorrent-3.1.9.ebuild, metadata.xml, qbittorrent-9999.ebuild:
+  Depend on latest qtsingleapplication in order to fix bug 507998. Several
+  ebuild enhancements. Remove old versions.
 
 *qbittorrent-3.1.9.2 (07 May 2014)
 
diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml
index 35405d402414..9eec7fece0f5 100644
--- a/net-p2p/qbittorrent/metadata.xml
+++ b/net-p2p/qbittorrent/metadata.xml
@@ -5,6 +5,6 @@
   <herd>qt</herd>
   <maintainer>
     <email>hwoarang@gentoo.org</email>
-	<name>Markos Chandras</name>
+    <name>Markos Chandras</name>
   </maintainer>
 </pkgmetadata>
diff --git a/net-p2p/qbittorrent/qbittorrent-2.9.7.ebuild b/net-p2p/qbittorrent/qbittorrent-2.9.7.ebuild
deleted file mode 100644
index d68a3ef7c67d..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-2.9.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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-2.9.7.ebuild,v 1.5 2013/03/02 23:09:45 hwoarang Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-
-inherit python 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="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"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	geoip? ( dev-libs/geoip )"
-
-DOCS="AUTHORS Changelog NEWS README TODO"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-	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"
-
-	# 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-3.0.11-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-3.0.11-r1.ebuild
deleted file mode 100644
index d8fb30b5b398..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.0.11-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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-r1.ebuild,v 1.1 2013/10/13 10:35:28 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{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
-	dev-qt/qtsingleapplication
-	>=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 \
-		--with-qtsingleapplication=system \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild
deleted file mode 100644
index fa90d9c87ce1..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.1.3.ebuild,v 1.2 2013/11/24 10:08:09 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{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 dev-qt/qtsingleapplication )
-	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 geoip     || myconf+=" --disable-geoip-database"
-	use dbus 	  || myconf+=" --disable-qt-dbus"
-
-	# 491494 workaround
-	if use X; then
-		myconf+=" --with-qtsingleapplication=system"
-	else
-		myconf+=" --disable-gui"
-	fi
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-libboost-inc=/usr/include/boost \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.4.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.4.ebuild
deleted file mode 100644
index 18a498a69b78..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.4.ebuild,v 1.1 2014/01/01 11:44:16 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{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
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904
-	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 geoip     || myconf+=" --disable-geoip-database"
-	use dbus 	  || myconf+=" --disable-qt-dbus"
-	use X         || myconf+=" --disable-gui"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-qtsingleapplication=system \
-		--with-libboost-inc=/usr/include/boost \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.5.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.5.ebuild
deleted file mode 100644
index 23f3ade271ce..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.5.ebuild,v 1.1 2014/01/17 19:58:44 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{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
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904
-	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 geoip     || myconf+=" --disable-geoip-database"
-	use dbus 	  || myconf+=" --disable-qt-dbus"
-	use X         || myconf+=" --disable-gui"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-qtsingleapplication=system \
-		--with-libboost-inc=/usr/include/boost \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.8.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.8.ebuild
deleted file mode 100644
index ac373e745aeb..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-3.1.8.ebuild,v 1.1 2014/02/04 17:43:19 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{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
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904
-	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 geoip     || myconf+=" --disable-geoip-database"
-	use dbus 	  || myconf+=" --disable-qt-dbus"
-	use X         || myconf+=" --disable-gui"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-qtsingleapplication=system \
-		--with-libboost-inc=/usr/include/boost \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild
new file mode 100644
index 000000000000..e24fc6b5c530
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-3.1.9.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 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.1 2014/05/24 22:53:34 pesa Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_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.10
+	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 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.9.2.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.9.2.ebuild
deleted file mode 100644
index 71084d584880..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.9.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 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.ebuild,v 1.1 2014/05/07 19:38:36 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{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.xz"
-
-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
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904[X?]
-	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 geoip     || myconf+=" --disable-geoip-database"
-	use dbus 	  || myconf+=" --disable-qt-dbus"
-	use X         || myconf+=" --disable-gui"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-qtsingleapplication=system \
-		--with-libboost-inc=/usr/include/boost \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-3.1.9.ebuild b/net-p2p/qbittorrent/qbittorrent-3.1.9.ebuild
deleted file mode 100644
index 0c3029ef3d25..000000000000
--- a/net-p2p/qbittorrent/qbittorrent-3.1.9.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 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.ebuild,v 1.2 2014/04/19 18:54:21 hwoarang Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{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
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904[X?]
-	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 geoip     || myconf+=" --disable-geoip-database"
-	use dbus 	  || myconf+=" --disable-qt-dbus"
-	use X         || myconf+=" --disable-gui"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-qtsingleapplication=system \
-		--with-libboost-inc=/usr/include/boost \
-		${myconf} || die "configure failed"
-	eqmake4
-}
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index ae87a95f7337..ed46c12010d6 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
@@ -1,56 +1,55 @@
 # Copyright 1999-2014 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.15 2014/04/19 18:54:21 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qbittorrent/qbittorrent-9999.ebuild,v 1.16 2014/05/24 22:53:34 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-EGIT_REPO_URI="git://github.com/${PN}/qBittorrent.git
-https://github.com/${PN}/qBittorrent.git"
-
-inherit python-r1 qt4-r2 git-2
+inherit python-r1 qt4-r2 git-r3
 
 DESCRIPTION="BitTorrent client in C++ and Qt"
 HOMEPAGE="http://www.qbittorrent.org/"
+EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="dbus +X geoip"
+IUSE="dbus debug geoip +X"
 
-# python-2 is a runtime dep only, for the search engine (see INSTALL file)
-CDEPEND="dev-libs/boost
+# geoip and python are runtime deps only (see INSTALL file)
+CDEPEND="
+	dev-libs/boost:=
 	dev-qt/qtcore:4
-	net-libs/rb_libtorrent
-	>=dev-qt/qtsingleapplication-2.6.1_p20130904[X?]
+	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[X?]
+	>=net-libs/rb_libtorrent-0.16.10
+	dbus? ( dev-qt/qtdbus:4 )
 	X? ( dev-qt/qtgui:4 )
-
-	dbus? ( dev-qt/qtdbus:4 )"
+"
 DEPEND="${CDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 RDEPEND="${CDEPEND}
 	${PYTHON_DEPS}
-	geoip? ( dev-libs/geoip )"
+	geoip? ( dev-libs/geoip )
+"
 
-DOCS="AUTHORS Changelog NEWS README TODO"
-
-src_prepare() {
-	# Respect LDFLAGS
-	sed -i -e 's/-Wl,--as-needed/$(LDFLAGS)/g' src/src.pro
-	qt4-r2_src_prepare
-}
+DOCS=(AUTHORS Changelog README TODO)
 
 src_configure() {
-	local myconf
-	use geoip     || myconf+=" --disable-geoip-database"
-	use dbus      || myconf+=" --disable-qt-dbus"
-	use X         || myconf+=" --disable-gui"
-
-	# econf fails, since this uses qconf
-	./configure --prefix=/usr --qtdir=/usr \
-		--with-qtsingleapplication=system \
-		--with-libboost-inc=/usr/include/boost \
-		${myconf} || die "configure failed"
+	# 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
 }