commit: 95fa09d1a3f307d7dda0bec6391153b7aa11eee4
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 15:18:25 2016 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:32:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fa09d1
net-p2p/deluge: Optional dep on monolithic or modular twisted
Gentoo-Bug: 602424
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../{deluge-1.3.9999.ebuild => deluge-1.3.13-r1.ebuild} | 13 ++++++++-----
net-p2p/deluge/deluge-1.3.9999.ebuild | 5 +++--
net-p2p/deluge/deluge-9999.ebuild | 5 +++--
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild
b/net-p2p/deluge/deluge-1.3.13-r1.ebuild
similarity index 94%
copy from net-p2p/deluge/deluge-1.3.9999.ebuild
copy to net-p2p/deluge/deluge-1.3.13-r1.ebuild
index 0090456..2463ab6 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.13-r1.ebuild
@@ -12,11 +12,10 @@ inherit distutils-r1 eutils systemd user l10n
DESCRIPTION="BitTorrent client with a client/server model"
HOMEPAGE="http://deluge-torrent.org/";
-if [[ ${PV} == 1.3.9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
http://git.deluge-torrent.org/${PN}";
- EGIT_BRANCH="1.3-stable"
SRC_URI=""
KEYWORDS=""
else
@@ -36,7 +35,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
)
-CDEPEND=">=net-libs/rb_libtorrent-0.14.9[python,${PYTHON_USEDEP}]"
+CDEPEND=">=net-libs/rb_libtorrent-1.0.9-r1[python,${PYTHON_USEDEP}]"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-util/intltool"
@@ -45,8 +44,12 @@ RDEPEND="${CDEPEND}
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
- >=dev-python/twisted-web-13.0[${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 )
gtk? (
sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild
b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 0090456..f98accf 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -45,8 +45,9 @@ RDEPEND="${CDEPEND}
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
- >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+ >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+ )
geoip? ( dev-libs/geoip )
gtk? (
sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
diff --git a/net-p2p/deluge/deluge-9999.ebuild
b/net-p2p/deluge/deluge-9999.ebuild
index 33cd876..98baa08 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -44,8 +44,9 @@ RDEPEND="${CDEPEND}
dev-python/pyopenssl[${PYTHON_USEDEP}]
dev-python/pyxdg[${PYTHON_USEDEP}]
dev-python/setproctitle[${PYTHON_USEDEP}]
- >=dev-python/twisted-core-13.0[${PYTHON_USEDEP}]
- >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+ || ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+ >=dev-python/twisted-web-13.0[${PYTHON_USEDEP}]
+ )
geoip? ( dev-libs/geoip )
gtk? (
sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
