commit:     4f871b6795b07cf61dba87992172daacc46fe32a
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Nov  8 11:43:46 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 22:13:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f871b67

net-p2p/deluge: fix libtorrent-rasterbar dependency and geoip USE-dep

Some more ebuild cleanup
Bug: https://bugs.gentoo.org/636860

 net-p2p/deluge/deluge-1.3.9999.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild 
b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 8055972cdb3..759e6ef8744 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -35,7 +35,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
+CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
        dev-python/setuptools[${PYTHON_USEDEP}]
        dev-util/intltool"
@@ -45,9 +45,12 @@ RDEPEND="${CDEPEND}
        dev-python/pyxdg[${PYTHON_USEDEP}]
        dev-python/setproctitle[${PYTHON_USEDEP}]
        || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+               (
+               >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
                >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+               )
        )
-       geoip? ( dev-libs/geoip )
+       geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
        gtk? (
                sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
                dev-python/pygobject:2[${PYTHON_USEDEP}]

Reply via email to