From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E83BE1388C1 for ; Fri, 4 Mar 2016 08:44:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C133DE07E8; Fri, 4 Mar 2016 08:44:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB1B4E07E2 for ; Fri, 4 Mar 2016 08:44:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6D28340C6C for ; Fri, 4 Mar 2016 08:44:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1460316C4 for ; Fri, 4 Mar 2016 08:44:43 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1456756681.65e9fb3ed91782ad6e03a001da4ba0a94371f474.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/deluge/deluge-9999.ebuild X-VCS-Directories: net-p2p/deluge/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 65e9fb3ed91782ad6e03a001da4ba0a94371f474 X-VCS-Branch: master Date: Fri, 4 Mar 2016 08:44:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 36608b45-0cc9-4ef3-ac3f-36fe6025a083 X-Archives-Hash: 8612fcbe83f6903ffa8b6333fac31298 commit: 65e9fb3ed91782ad6e03a001da4ba0a94371f474 Author: Paolo Pedroni iol it> AuthorDate: Mon Feb 29 14:38:01 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Mon Feb 29 14:38:01 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e9fb3e net-p2p/deluge: sync live ebuild with latest changes Fixes bug #476382, #293513 and #518354 net-p2p/deluge/deluge-9999.ebuild | 46 ++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild index 7aa1cdb..41f5ba8 100644 --- a/net-p2p/deluge/deluge-9999.ebuild +++ b/net-p2p/deluge/deluge-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,38 +25,50 @@ fi LICENSE="GPL-2" SLOT="0" IUSE="geoip gtk libnotify setproctitle sound webinterface" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=">=net-libs/rb_libtorrent-0.14.9[python] + dev-python/setuptools[${PYTHON_USEDEP}] dev-util/intltool" RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python] - dev-python/chardet - dev-python/pyopenssl - dev-python/pyxdg - >=dev-python/twisted-core-8.1 - >=dev-python/twisted-web-8.1 + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + >=dev-python/twisted-core-8.1[${PYTHON_USEDEP}] + >=dev-python/twisted-web-8.1[${PYTHON_USEDEP}] geoip? ( dev-libs/geoip ) gtk? ( - sound? ( dev-python/pygame ) - dev-python/pygobject:2 - >=dev-python/pygtk-2.12 + sound? ( dev-python/pygame[${PYTHON_USEDEP}] ) + dev-python/pygobject:2[${PYTHON_USEDEP}] + >=dev-python/pygtk-2.12[${PYTHON_USEDEP}] gnome-base/librsvg - libnotify? ( dev-python/notify-python ) + libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] ) ) - setproctitle? ( dev-python/setproctitle ) - webinterface? ( dev-python/mako )" + setproctitle? ( dev-python/setproctitle[${PYTHON_USEDEP}] ) + webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )" python_prepare_all() { - local PATCHES=( - "${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch - ) +# Not needed anymore: bug #518354 +# local PATCHES=( +# "${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch +# ) distutils-r1_python_prepare_all } +_distutils-r1_create_setup_cfg() { + # bug 531370: deluge has its own plugin system. No need to relocate its egg info files. + # Override this call from the distutils-r1 eclass. + # This does not respect the distutils-r1 API. DONOT copy this example. + : +} + python_install_all() { distutils-r1_python_install_all - newinitd "${FILESDIR}"/deluged.init deluged - newconfd "${FILESDIR}"/deluged.conf deluged + newinitd "${FILESDIR}"/deluged.init-2 deluged + newconfd "${FILESDIR}"/deluged.conf-2 deluged + newinitd "${FILESDIR}"/deluge-web.init deluge-web + newconfd "${FILESDIR}"/deluge-web.conf deluge-web systemd_dounit "${FILESDIR}"/deluged.service systemd_dounit "${FILESDIR}"/deluge-web.service }