Gentoo Archives: gentoo-commits

From: Ian Delaney <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/
Date: Fri, 04 Mar 2016 08:44:50
Message-Id: 1456756681.65e9fb3ed91782ad6e03a001da4ba0a94371f474.idella4@gentoo
1 commit: 65e9fb3ed91782ad6e03a001da4ba0a94371f474
2 Author: Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
3 AuthorDate: Mon Feb 29 14:38:01 2016 +0000
4 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 29 14:38:01 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e9fb3e
7
8 net-p2p/deluge: sync live ebuild with latest changes
9
10 Fixes bug #476382, #293513 and #518354
11
12 net-p2p/deluge/deluge-9999.ebuild | 46 ++++++++++++++++++++++++---------------
13 1 file changed, 29 insertions(+), 17 deletions(-)
14
15 diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
16 index 7aa1cdb..41f5ba8 100644
17 --- a/net-p2p/deluge/deluge-9999.ebuild
18 +++ b/net-p2p/deluge/deluge-9999.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2014 Gentoo Foundation
21 +# Copyright 1999-2016 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23 # $Id$
24
25 @@ -25,38 +25,50 @@ fi
26 LICENSE="GPL-2"
27 SLOT="0"
28 IUSE="geoip gtk libnotify setproctitle sound webinterface"
29 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
30
31 DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
32 + dev-python/setuptools[${PYTHON_USEDEP}]
33 dev-util/intltool"
34 RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
35 - dev-python/chardet
36 - dev-python/pyopenssl
37 - dev-python/pyxdg
38 - >=dev-python/twisted-core-8.1
39 - >=dev-python/twisted-web-8.1
40 + dev-python/chardet[${PYTHON_USEDEP}]
41 + dev-python/pyopenssl[${PYTHON_USEDEP}]
42 + dev-python/pyxdg[${PYTHON_USEDEP}]
43 + >=dev-python/twisted-core-8.1[${PYTHON_USEDEP}]
44 + >=dev-python/twisted-web-8.1[${PYTHON_USEDEP}]
45 geoip? ( dev-libs/geoip )
46 gtk? (
47 - sound? ( dev-python/pygame )
48 - dev-python/pygobject:2
49 - >=dev-python/pygtk-2.12
50 + sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
51 + dev-python/pygobject:2[${PYTHON_USEDEP}]
52 + >=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
53 gnome-base/librsvg
54 - libnotify? ( dev-python/notify-python )
55 + libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
56 )
57 - setproctitle? ( dev-python/setproctitle )
58 - webinterface? ( dev-python/mako )"
59 + setproctitle? ( dev-python/setproctitle[${PYTHON_USEDEP}] )
60 + webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
61
62 python_prepare_all() {
63 - local PATCHES=(
64 - "${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
65 - )
66 +# Not needed anymore: bug #518354
67 +# local PATCHES=(
68 +# "${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
69 +# )
70
71 distutils-r1_python_prepare_all
72 }
73
74 +_distutils-r1_create_setup_cfg() {
75 + # bug 531370: deluge has its own plugin system. No need to relocate its egg info files.
76 + # Override this call from the distutils-r1 eclass.
77 + # This does not respect the distutils-r1 API. DONOT copy this example.
78 + :
79 +}
80 +
81 python_install_all() {
82 distutils-r1_python_install_all
83 - newinitd "${FILESDIR}"/deluged.init deluged
84 - newconfd "${FILESDIR}"/deluged.conf deluged
85 + newinitd "${FILESDIR}"/deluged.init-2 deluged
86 + newconfd "${FILESDIR}"/deluged.conf-2 deluged
87 + newinitd "${FILESDIR}"/deluge-web.init deluge-web
88 + newconfd "${FILESDIR}"/deluge-web.conf deluge-web
89 systemd_dounit "${FILESDIR}"/deluged.service
90 systemd_dounit "${FILESDIR}"/deluge-web.service
91 }