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

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

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 8055972cdb31d01ffe3a7bd6071b7011ba92e52b..759e6ef874435845a7993e7fe99d419e0cba9950 100644 (file)
--- 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}]