commit:     515ea8af3960977c70faf513dce4b650a69d5ff1
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 21:15:29 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 21:20:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=515ea8af

net-p2p/deluge: dev-python/mako is an unconditional dependency

Closes: https://bugs.gentoo.org/697888
Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/{deluge-9999.ebuild => deluge-2.0.3-r1.ebuild} | 4 ++--
 net-p2p/deluge/deluge-9999.ebuild                             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild 
b/net-p2p/deluge/deluge-2.0.3-r1.ebuild
similarity index 97%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r1.ebuild
index 879207fa8b3..9d936b780a0 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r1.ebuild
@@ -51,7 +51,7 @@ RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
                libnotify? ( x11-libs/libnotify )
        )
        net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+       dev-python/mako[${PYTHON_USEDEP}]"
 
 PATCHES=(
        "${FILESDIR}/${PN}-2.0.3-setup.py.patch"
@@ -99,7 +99,7 @@ python_install_all() {
        if use webinterface; then
                newinitd "${FILESDIR}/deluge-web.init" deluge-web
                newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-               systemd_newunit "${FILESDIR}/deluge-web.service-2" 
deluge-web.service
+               systemd_newunit "${FILESDIR}/deluge-web.service-3" 
deluge-web.service
                systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
        else
                rm -rf 
"${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die

diff --git a/net-p2p/deluge/deluge-9999.ebuild 
b/net-p2p/deluge/deluge-9999.ebuild
index 879207fa8b3..9d936b780a0 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -51,7 +51,7 @@ RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
                libnotify? ( x11-libs/libnotify )
        )
        net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-       webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+       dev-python/mako[${PYTHON_USEDEP}]"
 
 PATCHES=(
        "${FILESDIR}/${PN}-2.0.3-setup.py.patch"
@@ -99,7 +99,7 @@ python_install_all() {
        if use webinterface; then
                newinitd "${FILESDIR}/deluge-web.init" deluge-web
                newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-               systemd_newunit "${FILESDIR}/deluge-web.service-2" 
deluge-web.service
+               systemd_newunit "${FILESDIR}/deluge-web.service-3" 
deluge-web.service
                systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
        else
                rm -rf 
"${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die

Reply via email to