[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     6382a5fd25c541bc7a41bff17013fabfa1345511
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 02:47:55 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 02:47:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6382a5fd

net-p2p/deluge: drop test restrict, drop py3.9, sync live

pytest-twisted has py3.12 now -> drop test restriction.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r5.ebuild | 4 +---
 net-p2p/deluge/deluge-9999.ebuild     | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r5.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
index 2bc31057562f..7891983e5083 100644
--- a/net-p2p/deluge/deluge-2.1.1-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd xdg
@@ -71,8 +71,6 @@ PATCHES=(
 	"${FILESDIR}/${P}-consoleui-deferred.patch"
 )
 
-RESTRICT=test # Requires python-3.12 enabled dev-python/pytest-twisted
-
 distutils_enable_tests pytest
 
 python_prepare_all() {

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index f6ab3f627406..ed7bb276078c 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd xdg

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     662b287ee229b580e0dcdd14bd1daaf7774fba8e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 15:37:43 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 15:41:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662b287e

net-p2p/deluge: Dekeyword ~ppc

Dekeyword ~ppc as dev-python/greenlet segfaults there.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r1.ebuild | 4 ++--
 net-p2p/deluge/deluge-2.1.1-r4.ebuild | 4 ++--
 net-p2p/deluge/deluge-2.1.1-r5.ebuild | 2 +-
 net-p2p/deluge/deluge-9999.ebuild     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
index 04ff97d96706..ffdb31ae7607 100644
--- a/net-p2p/deluge/deluge-2.1.1-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-p2p/deluge/deluge-2.1.1-r4.ebuild b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
index 5f5ebcd7702f..734f76d35e3c 100644
--- a/net-p2p/deluge/deluge-2.1.1-r4.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-p2p/deluge/deluge-2.1.1-r5.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
index f0c99fabf374..a7a9d775474e 100644
--- a/net-p2p/deluge/deluge-2.1.1-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index ed7bb276078c..fbae2ca39a18 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     91fe351174058b3389a2e8c4f4152722d411932a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  5 15:39:54 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  5 15:41:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91fe3511

net-p2p/deluge: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r1.ebuild | 170 --------------------------------
 net-p2p/deluge/deluge-2.1.1-r4.ebuild | 178 ----------------------------------
 2 files changed, 348 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
deleted file mode 100644
index ffdb31ae7607..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd xdg
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gui libnotify sound webinterface"
-REQUIRED_USE="
-	libnotify? ( gui )
-	sound? ( gui )
-"
-
-BDEPEND="
-	dev-util/intltool
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	acct-group/deluge
-	acct-user/deluge
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		gui? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
-			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
-		)
-		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=( "${FILESDIR}/${P}-twisted-22.10.patch" )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
-		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
-		# Skipped upstream
-		deluge/tests/test_security.py
-	)
-	local EPYTEST_DESELECT=(
-		# Skipped upstream
-		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
-		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
-		# never returns
-		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
-		# failing network(?)-related tests, even with sandbox disabled
-		'deluge/tests/test_common.py::TestCommon::test_is_interface'
-		# fails
-		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
-		# fails because of network sandbox
-		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
-		# segfaults with FEATURES="network-sandbox"
-		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
-	)
-
-	# dev-python/pytest-twisted has disabled autoloading
-	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gui ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-	else
-		mkdir -p "${ED}/usr/share/applications/" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
-		mkdir -p "${ED}/usr/share/metainfo" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
-	fi
-
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If, after upgrading, deluge doesn't work please back up and then"
-	elog "remove your '~/.config/deluge' directory and try again"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-2.1.1-r4.ebuild b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
deleted file mode 100644
index 734f76d35e3c..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r4.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd xdg
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gui libnotify sound webinterface"
-REQUIRED_USE="
-	libnotify? ( gui )
-	sound? ( gui )
-"
-
-BDEPEND="
-	dev-util/intltool
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	acct-group/deluge
-	acct-user/deluge
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		gui? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
-			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
-		)
-		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-twisted-22.10.patch"
-	# https://dev.deluge-torrent.org/ticket/3598
-	"${FILESDIR}/${P}-ayatana.patch"
-	# https://dev.deluge-torrent.org/ticket/3582
-	"${FILESDIR}/${P}-consoleui-deferred.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
-		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
-		# Skipped upstream
-		deluge/tests/test_security.py
-	)
-	local EPYTEST_DESELECT=(
-		# Skipped upstream
-		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
-		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
-		# never returns
-		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
-		# failing network(?)-related tests, even with sandbox disabled
-		'deluge/tests/test_common.py::TestCommon::test_is_interface'
-		# fails
-		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
-		# fails because of network sandbox
-		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
-		# segfaults with FEATURES="network-sandbox"
-		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
-	)
-
-	# dev-python/pytest-twisted has disabled autoloading
-	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gui ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-	else
-		mkdir -p "${ED}/usr/share/applications/" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
-		mkdir -p "${ED}/usr/share/metainfo" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
-	fi
-
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If, after upgrading, deluge doesn't work please back up and then"
-	elog "remove your '~/.config/deluge' directory and try again"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "'/etc/init.d/deluged start' as root if you use OpenRC"
-	elog "or"
-	elog "'systemctl start deluged.service' as root if you use systemd"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     8ad8811f358afc502352bc933d74cf3dc0e2c3fe
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Fri May 31 13:24:39 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 02:39:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad8811f

net-p2p/deluge: revbump for python-3.12 support

Tests RESTRICTed because they need dev-python/python-twisted,
which has no python-3.12 support.

Closes: https://bugs.gentoo.org/933212
Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>
Closes: https://github.com/gentoo/gentoo/pull/36918
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r5.ebuild | 180 ++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/net-p2p/deluge/deluge-2.1.1-r5.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
new file mode 100644
index 000000000000..2bc31057562f
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 systemd xdg
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console gui libnotify sound webinterface"
+REQUIRED_USE="
+	libnotify? ( gui )
+	sound? ( gui )
+"
+
+BDEPEND="
+	dev-util/intltool
+	test? (
+		$(python_gen_cond_dep '
+			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	acct-group/deluge
+	acct-user/deluge
+	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		gui? (
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
+			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
+		)
+		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	')
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-twisted-22.10.patch"
+	# https://dev.deluge-torrent.org/ticket/3598
+	"${FILESDIR}/${P}-ayatana.patch"
+	# https://dev.deluge-torrent.org/ticket/3582
+	"${FILESDIR}/${P}-consoleui-deferred.patch"
+)
+
+RESTRICT=test # Requires python-3.12 enabled dev-python/pytest-twisted
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
+		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+		# Skipped upstream
+		deluge/tests/test_security.py
+	)
+	local EPYTEST_DESELECT=(
+		# Skipped upstream
+		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
+		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
+		# never returns
+		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
+		# failing network(?)-related tests, even with sandbox disabled
+		'deluge/tests/test_common.py::TestCommon::test_is_interface'
+		# fails
+		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
+		# fails because of network sandbox
+		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
+		# segfaults with FEATURES="network-sandbox"
+		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
+	)
+
+	# dev-python/pytest-twisted has disabled autoloading
+	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gui ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+	else
+		mkdir -p "${ED}/usr/share/applications/" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
+		mkdir -p "${ED}/usr/share/metainfo" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
+	fi
+
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
+	fi
+
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "If, after upgrading, deluge doesn't work please back up and then"
+	elog "remove your '~/.config/deluge' directory and try again"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "'/etc/init.d/deluged start' as root if you use OpenRC"
+	elog "or"
+	elog "'systemctl start deluged.service' as root if you use systemd"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     fd93d990d68504af8bc10d256316da4ee6b8137b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 02:48:45 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 02:48:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd93d990

net-p2p/deluge: stabilize 2.1.1-r5 for amd64, x86

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r5.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
index 7891983e5083..f0c99fabf374 100644
--- a/net-p2p/deluge/deluge-2.1.1-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Joonas Niilola]

commit:     e960e96f17fade5e03378feb3833ea6c22aca48b
Author:     Alexander Kurakin <kuraga333 <AT> mail <DOT> ru>
AuthorDate: Sun May 21 16:10:41 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat May 27 07:49:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e960e96f

net-p2p/deluge: remove duplicate dep declaration

PYTHON_REQUIRED_USE is already set by distutils-r1

Signed-off-by: Alexander Kurakin <kuraga333 <AT> mail.ru>
Closes: https://github.com/gentoo/gentoo/pull/31117
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r1.ebuild | 1 -
 net-p2p/deluge/deluge-2.1.1-r4.ebuild | 1 -
 net-p2p/deluge/deluge-9999.ebuild     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
index 379bc32a63c2..04ff97d96706 100644
--- a/net-p2p/deluge/deluge-2.1.1-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
@@ -23,7 +23,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="console gui libnotify sound webinterface"
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
 	libnotify? ( gui )
 	sound? ( gui )
 "

diff --git a/net-p2p/deluge/deluge-2.1.1-r4.ebuild b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
index d7c3b31c3658..5f5ebcd7702f 100644
--- a/net-p2p/deluge/deluge-2.1.1-r4.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
@@ -23,7 +23,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="console gui libnotify sound webinterface"
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
 	libnotify? ( gui )
 	sound? ( gui )
 "

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 197540569dc2..f6ab3f627406 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -23,7 +23,6 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="console gui libnotify sound webinterface"
 REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
 	libnotify? ( gui )
 	sound? ( gui )
 "

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Joonas Niilola]

commit:     4035523d12576f52462355d3c8024ea8201125e7
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 05:57:11 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 21 05:57:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4035523d

net-p2p/deluge: Stabilize 2.1.1-r4 x86, #906745

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r4.ebuild b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
index 25a8eb363087..d7c3b31c3658 100644
--- a/net-p2p/deluge/deluge-2.1.1-r4.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     19dfd0ce0ad7df7ef7526d9b4743112f13388ef0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 07:13:27 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 20 07:13:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19dfd0ce

net-p2p/deluge: Stabilize 2.1.1-r4 amd64, #906745

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r4.ebuild b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
index 578a7a9dcdc9..25a8eb363087 100644
--- a/net-p2p/deluge/deluge-2.1.1-r4.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Pacho Ramos]

commit:     5eae2d2916a1257ab2e9f39538012c7fb26a08dc
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 09:10:38 2023 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri May 19 09:10:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eae2d29

net-p2p/deluge: drop 2.1.1-r2, 2.1.1-r3

Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r2.ebuild | 173 ---------------------------------
 net-p2p/deluge/deluge-2.1.1-r3.ebuild | 177 ----------------------------------
 2 files changed, 350 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r2.ebuild b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
deleted file mode 100644
index 9239e7a1126d..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd xdg
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gui libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gui )
-	sound? ( gui )
-"
-
-BDEPEND="
-	dev-util/intltool
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	acct-group/deluge
-	acct-user/deluge
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		gui? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
-			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
-		)
-		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=( "${FILESDIR}/${P}-twisted-22.10.patch" )
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
-		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
-		# Skipped upstream
-		deluge/tests/test_security.py
-	)
-	local EPYTEST_DESELECT=(
-		# Skipped upstream
-		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
-		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
-		# never returns
-		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
-		# failing network(?)-related tests, even with sandbox disabled
-		'deluge/tests/test_common.py::TestCommon::test_is_interface'
-		# fails
-		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
-		# fails because of network sandbox
-		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
-		# segfaults with FEATURES="network-sandbox"
-		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
-	)
-
-	# dev-python/pytest-twisted has disabled autoloading
-	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gui ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-	else
-		mkdir -p "${ED}/usr/share/applications/" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
-		mkdir -p "${ED}/usr/share/metainfo" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
-	fi
-
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If, after upgrading, deluge doesn't work please back up and then"
-	elog "remove your '~/.config/deluge' directory and try again"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "'/etc/init.d/deluged start' as root if you use OpenRC"
-	elog "or"
-	elog "'systemctl start deluged.service' as root if you use systemd"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-2.1.1-r3.ebuild b/net-p2p/deluge/deluge-2.1.1-r3.ebuild
deleted file mode 100644
index 2d6ade36c4d5..000000000000
--- a/net-p2p/deluge/deluge-2.1.1-r3.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd xdg
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console gui libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gui )
-	sound? ( gui )
-"
-
-BDEPEND="
-	dev-util/intltool
-	test? (
-		$(python_gen_cond_dep '
-			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-RDEPEND="
-	acct-group/deluge
-	acct-user/deluge
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		gui? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/distro[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/setproctitle[${PYTHON_USEDEP}]
-		|| (
-			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
-			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
-		)
-		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	')
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-twisted-22.10.patch"
-	# https://dev.deluge-torrent.org/ticket/3598
-	"${FILESDIR}/${P}-ayatana.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
-		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
-		# Skipped upstream
-		deluge/tests/test_security.py
-	)
-	local EPYTEST_DESELECT=(
-		# Skipped upstream
-		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
-		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
-		# never returns
-		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
-		# failing network(?)-related tests, even with sandbox disabled
-		'deluge/tests/test_common.py::TestCommon::test_is_interface'
-		# fails
-		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
-		# fails because of network sandbox
-		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
-		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
-		# segfaults with FEATURES="network-sandbox"
-		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
-	)
-
-	# dev-python/pytest-twisted has disabled autoloading
-	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gui ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-	else
-		mkdir -p "${ED}/usr/share/applications/" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
-		mkdir -p "${ED}/usr/share/metainfo" || die
-		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
-	fi
-
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-4" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "If, after upgrading, deluge doesn't work please back up and then"
-	elog "remove your '~/.config/deluge' directory and try again"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "'/etc/init.d/deluged start' as root if you use OpenRC"
-	elog "or"
-	elog "'systemctl start deluged.service' as root if you use systemd"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     65f0ecbecf088f9b777be514d12c6d34c409a18b
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Tue Mar 21 16:21:18 2023 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 16:42:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f0ecbe

net-p2p/deluge: enable py3.11

Closes: https://bugs.gentoo.org/897142
Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>

net-p2p/deluge: enable py3.11 for live ebuild as well

Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>
Closes: https://github.com/gentoo/gentoo/pull/30288
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1-r1.ebuild | 2 +-
 net-p2p/deluge/deluge-2.1.1-r2.ebuild | 2 +-
 net-p2p/deluge/deluge-9999.ebuild     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
index 9cca6cbcf30b..379bc32a63c2 100644
--- a/net-p2p/deluge/deluge-2.1.1-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd xdg

diff --git a/net-p2p/deluge/deluge-2.1.1-r2.ebuild b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
index 11b28b690778..9239e7a1126d 100644
--- a/net-p2p/deluge/deluge-2.1.1-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd xdg

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index d075d8e464b6..197540569dc2 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd xdg

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     f2783eacbb5de7307adbec4f7c03f84b435c03ae
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 23:40:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 23:42:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2783eac

net-p2p/deluge: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/metadata.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 5adefb9a32dc..7b68e8a01656 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -13,9 +13,11 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
-<use>
-	<flag name="webinterface">Install dependencies needed for the web
-		interface</flag>
-	<flag name="console">Enable default console UI</flag>
-</use>
+	<use>
+		<flag name="webinterface">Install dependencies needed for the web interface</flag>
+		<flag name="console">Enable default console UI</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">deluge-torrent/deluge</remote-id>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Joonas Niilola]

commit:     12686771daf7eb80ed380040f1d2ae7cef1adad1
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 05:47:21 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 05:48:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12686771

net-p2p/deluge: Stabilize 2.1.1 x86, #877037

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index 666613d61feb..6e8715c9404e 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     671f621d1246c191ee33d1df9d62354cd69b437f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 14 01:28:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 14 01:28:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=671f621d

net-p2p/deluge: Stabilize 2.1.1 amd64, #877037

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index 82e9d085a02a..666613d61feb 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     24397f75cfbb411d42d1bbce58ce6bfa93e3578f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 23:39:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 23:39:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24397f75

net-p2p/deluge: Keyword 2.1.1 x86, #866614

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index e1308fa47596..82e9d085a02a 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     5e48cb84efb9f1bdb6e7d268f022498c305f6ef8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 23:15:36 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 23:24:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e48cb84

net-p2p/deluge: fix StaticSrcUri

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.5-r2.ebuild b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
index cb1b052dce3e..f7144d94500d 100644
--- a/net-p2p/deluge/deluge-2.0.5-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 fi
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Yixun Lan]

commit:     8a54312269c0484ad1b01466bb9aa277fd49bf0b
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 02:01:35 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 02:51:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a543122

net-p2p/deluge: forward keywords to live ebuild

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-p2p/deluge/deluge-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 2ebeca0f434a..e1308fa47596 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Yixun Lan]

commit:     b0d2550e6bd9c5c9b59ab5f89a1e498531a4d0a3
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 01:47:05 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 02:51:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d2550e

net-p2p/deluge: Keyword 2.1.1 riscv, #870289

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index c20e9f975f8f..e1308fa47596 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Arthur Zamarin]

commit:     5c5747d0f3907219d9ad1156da49c6fa036a7b25
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 15:42:35 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 15:42:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5747d0

net-p2p/deluge: Keyword 2.1.1 arm, #866614

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index a44545f99a8d..c20e9f975f8f 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Arthur Zamarin]

commit:     33a8c02408f2b7b24310afa41b218a769c941012
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 15:42:13 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 15:42:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a8c024

net-p2p/deluge: Keyword 2.1.1 arm64, #866614

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index bce30e659a47..a44545f99a8d 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc"
+	KEYWORDS="~amd64 ~arm64 ~ppc"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     57c94ead0f25e5f4111615db841d5f1989bdd488
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 11:40:42 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 11:40:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57c94ead

net-p2p/deluge: crank up pytest-twisted dep

Bug: https://bugs.gentoo.org/866677
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 net-p2p/deluge/deluge-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index 86bcc748d7fa..bce30e659a47 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 	dev-util/intltool
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/pytest-twisted[${PYTHON_USEDEP}]
+			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
 		')
 	)
 "

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 4f6d5700be45..2ebeca0f434a 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 	dev-util/intltool
 	test? (
 		$(python_gen_cond_dep '
-			dev-python/pytest-twisted[${PYTHON_USEDEP}]
+			>=dev-python/pytest-twisted-1.13.4-r1[${PYTHON_USEDEP}]
 		')
 	)
 "

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Arthur Zamarin]

commit:     cbf2d7c923d5eb23f8e706844aa8ce0c1b26b367
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 09:58:20 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 09:58:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbf2d7c9

net-p2p/deluge: Keyword 2.1.1 ppc, #866614

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index 4f6d5700be45..86bcc748d7fa 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     740653c1e948eb4fe8995d4093b0897b2633c332
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 26 07:19:51 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 07:19:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740653c1

net-p2p/deluge: style tweaks

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.1.1.ebuild | 4 ++--
 net-p2p/deluge/deluge-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
index 10e6eba69d52..4f6d5700be45 100644
--- a/net-p2p/deluge/deluge-2.1.1.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
+inherit distutils-r1 systemd xdg
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 10e6eba69d52..4f6d5700be45 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
+inherit distutils-r1 systemd xdg
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     463a06f28960ff4931f3811e884eef363573701e
Author:     Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja>
AuthorDate: Thu Aug 18 04:09:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 07:18:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=463a06f2

net-p2p/deluge: add 2.1.1, update 9999

- USE gtk -> gui
- distutils PEP517

Signed-off-by: Matt Jolly <Matt.Jolly <AT> footclan.ninja>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/Manifest                            |   1 +
 .../{deluge-9999.ebuild => deluge-2.1.1.ebuild}    | 111 +++++++++++++--------
 net-p2p/deluge/deluge-9999.ebuild                  | 111 +++++++++++++--------
 3 files changed, 137 insertions(+), 86 deletions(-)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 35c526df0cbb..1304a7562619 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1 +1,2 @@
 DIST deluge-2.0.5.tar.xz 1895268 BLAKE2B 2c815aa9dbbbed5ba780d694b0518f224577b9c370a03712b15c706eda6de55e34b834f624ec18001c9d41b925677b6a001a384691a7ffd9f29c16731a735d4b SHA512 6c2994ca2906fdb92e96aa3534a4ffd5199e9ab6a1b5b12de94c94ec29850cad0cef7546ae1bea5188075fd16a07e584a17bf2f8b5eb1d2b91dee2da1e494588
+DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
similarity index 56%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.1.1.ebuild
index 344df118563b..10e6eba69d52 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg distutils-r1 systemd
 
@@ -14,30 +15,39 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console gtk libnotify sound webinterface"
+IUSE="console gui libnotify sound webinterface"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
+	libnotify? ( gui )
+	sound? ( gui )
 "
 
-DEPEND="
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
+BDEPEND="
 	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest-twisted[${PYTHON_USEDEP}]
+		')
+	)
+"
+
 RDEPEND="
+	acct-group/deluge
+	acct-user/deluge
 	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
+		gui? (
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
@@ -45,32 +55,19 @@ RDEPEND="
 		dev-python/pyxdg[${PYTHON_USEDEP}]
 		dev-python/rencode[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
 		|| (
 			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
 			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
 		)
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
 		dev-python/mako[${PYTHON_USEDEP}]
-	')"
+	')
+"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
 		-e 's|"new_release_check": True|"new_release_check": False|'
 		-e 's|"check_new_releases": True|"check_new_releases": False|'
 		-e 's|"show_new_releases": True|"show_new_releases": False|'
@@ -80,13 +77,36 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
+		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+		# Skipped upstream
+		deluge/tests/test_security.py
+	)
+	local EPYTEST_DESELECT=(
+		# Skipped upstream
+		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
+		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
+		# never returns
+		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
+		# failing network(?)-related tests, even with sandbox disabled
+		'deluge/tests/test_common.py::TestCommon::test_is_interface'
+		# fails
+		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
+		# fails because of network sandbox
+		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
+		# segfaults with FEATURES="network-sandbox"
+		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
+	)
+
+	# dev-python/pytest-twisted has disabled autoloading
+	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
 }
 
 python_install_all() {
@@ -96,13 +116,18 @@ python_install_all() {
 		rm "${ED}/usr/bin/deluge-console" || die
 		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
 	fi
-	if ! use gtk ; then
+	if ! use gui ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
 		rm -r "${ED}/usr/share/icons/" || die
 		rm "${ED}/usr/bin/deluge-gtk" || die
 		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${ED}/usr/share/applications/deluge.desktop" || die
+	else
+		mkdir -p "${ED}/usr/share/applications/" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
+		mkdir -p "${ED}/usr/share/metainfo" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
 	fi
+
 	if use webinterface; then
 		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
 		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
@@ -113,6 +138,7 @@ python_install_all() {
 		rm "${ED}/usr/bin/deluge-web" || die
 		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
 	fi
+
 	newinitd "${FILESDIR}"/deluged.init-2 deluged
 	newconfd "${FILESDIR}"/deluged.conf-2 deluged
 	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
@@ -125,9 +151,8 @@ pkg_postinst() {
 	xdg_pkg_postinst
 
 	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
+	elog "If, after upgrading, deluge doesn't work please back up and then"
+	elog "remove your '~/.config/deluge' directory and try again"
 	elog
 	elog "To start the daemon either run 'deluged' as user"
 	elog "or modify /etc/conf.d/deluged and run"
@@ -139,6 +164,6 @@ pkg_postinst() {
 	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
 	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
 	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 344df118563b..10e6eba69d52 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg distutils-r1 systemd
 
@@ -14,30 +15,39 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console gtk libnotify sound webinterface"
+IUSE="console gui libnotify sound webinterface"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
+	libnotify? ( gui )
+	sound? ( gui )
 "
 
-DEPEND="
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
+BDEPEND="
 	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pytest-twisted[${PYTHON_USEDEP}]
+		')
+	)
+"
+
 RDEPEND="
+	acct-group/deluge
+	acct-user/deluge
 	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
+		gui? (
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
@@ -45,32 +55,19 @@ RDEPEND="
 		dev-python/pyxdg[${PYTHON_USEDEP}]
 		dev-python/rencode[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
 		|| (
 			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
 			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
 		)
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
 		dev-python/mako[${PYTHON_USEDEP}]
-	')"
+	')
+"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
 		-e 's|"new_release_check": True|"new_release_check": False|'
 		-e 's|"check_new_releases": True|"check_new_releases": False|'
 		-e 's|"show_new_releases": True|"show_new_releases": False|'
@@ -80,13 +77,36 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
+python_test() {
+	local EPYTEST_IGNORE=(
+		# Upstream CI/CD skips these and they seem to intentionally segfault to collect core dumps...
+		deluge/plugins/Stats/deluge_stats/tests/test_stats.py
+		# Skipped upstream
+		deluge/tests/test_security.py
+	)
+	local EPYTEST_DESELECT=(
+		# Skipped upstream
+		'deluge/plugins/WebUi/deluge_webui/tests/test_plugin_webui.py::TestWebUIPlugin::test_enable_webui'
+		'deluge/tests/test_torrent.py::TestTorrent::test_torrent_error_resume_data_unaltered'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_seo_svg_with_sni'
+		# never returns
+		'deluge/tests/test_ui_entry.py::TestConsoleScriptEntryWithDaemon'
+		# failing network(?)-related tests, even with sandbox disabled
+		'deluge/tests/test_common.py::TestCommon::test_is_interface'
+		# fails
+		'deluge/tests/test_core.py::TestCore::test_pause_torrents'
+		# fails because of network sandbox
+		'deluge/tests/test_core.py::TestCore::test_test_listen_port'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_deluge_png'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_hebrew'
+		'deluge/tests/test_tracker_icons.py::TestTrackerIcons::test_get_google_ico_with_redirect'
+		# segfaults with FEATURES="network-sandbox"
+		'deluge/tests/test_core.py::TestCore::test_pause_torrent'
+	)
+
+	# dev-python/pytest-twisted has disabled autoloading
+	epytest -m "not (todo or gtkui)" -p pytest_twisted -v
 }
 
 python_install_all() {
@@ -96,13 +116,18 @@ python_install_all() {
 		rm "${ED}/usr/bin/deluge-console" || die
 		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
 	fi
-	if ! use gtk ; then
+	if ! use gui ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
 		rm -r "${ED}/usr/share/icons/" || die
 		rm "${ED}/usr/bin/deluge-gtk" || die
 		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${ED}/usr/share/applications/deluge.desktop" || die
+	else
+		mkdir -p "${ED}/usr/share/applications/" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/applications/deluge.desktop" "${ED}/usr/share/applications/" || die
+		mkdir -p "${ED}/usr/share/metainfo" || die
+		cp "${WORKDIR}/${P}/deluge/ui/data/share/appdata/deluge.appdata.xml" "${ED}/usr/share/metainfo/" || die
 	fi
+
 	if use webinterface; then
 		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
 		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
@@ -113,6 +138,7 @@ python_install_all() {
 		rm "${ED}/usr/bin/deluge-web" || die
 		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
 	fi
+
 	newinitd "${FILESDIR}"/deluged.init-2 deluged
 	newconfd "${FILESDIR}"/deluged.conf-2 deluged
 	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
@@ -125,9 +151,8 @@ pkg_postinst() {
 	xdg_pkg_postinst
 
 	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
+	elog "If, after upgrading, deluge doesn't work please back up and then"
+	elog "remove your '~/.config/deluge' directory and try again"
 	elog
 	elog "To start the daemon either run 'deluged' as user"
 	elog "or modify /etc/conf.d/deluged and run"
@@ -139,6 +164,6 @@ pkg_postinst() {
 	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
 	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
 	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog "For more information see https://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     76ae5b30c671423cbd39e0edd9284562e2022058
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 09:51:43 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul  4 06:57:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ae5b30

net-p2p/deluge: Account for dev-python/twisted USE={crypt → ssl}

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-p2p/deluge/{deluge-2.0.5-r1.ebuild => deluge-2.0.5-r2.ebuild} | 5 ++++-
 net-p2p/deluge/deluge-9999.ebuild                                 | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.5-r1.ebuild b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
similarity index 97%
rename from net-p2p/deluge/deluge-2.0.5-r1.ebuild
rename to net-p2p/deluge/deluge-2.0.5-r2.ebuild
index ecb8c4c8a4fd..a7ebceeadb89 100644
--- a/net-p2p/deluge/deluge-2.0.5-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r2.ebuild
@@ -46,7 +46,10 @@ RDEPEND="
 		dev-python/rencode[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
+			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
+		)
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 9bf0efe9a73f..644f610caf03 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -46,7 +46,10 @@ RDEPEND="
 		dev-python/rencode[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-17.1.0[ssl(-),${PYTHON_USEDEP}]
+			>=dev-python/twisted-17.1.0[crypt(-),${PYTHON_USEDEP}]
+		)
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     ab8a8b480e876829c15a90a38f9574583d2ff1b9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 12:50:22 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 06:43:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8a8b48

net-p2p/deluge: Dekeyword ~sparc due to twisted[crypt] dep

Remove ~sparc keyword since this package (indirectly) depends
on dev-python/cryptography that requires Rust nowadays.  This flew
under the radar so far because we still have non-Rust cryptography
versions but we do not intend to maintain them longer than absolutely
necessary and deluge does not really seem like a very important package
to justify keeping ~sparc keywords.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.5-r1.ebuild | 2 +-
 net-p2p/deluge/deluge-9999.ebuild     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.5-r1.ebuild b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
index 087d6c65dbd4..ecb8c4c8a4fd 100644
--- a/net-p2p/deluge/deluge-2.0.5-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index f432594a17df..9bf0efe9a73f 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Joonas Niilola]

commit:     6452c4bc11cce87a31a4a24e6042bbcf798538bc
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 16:16:36 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 26 16:17:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6452c4bc

net-p2p/deluge: Stabilize 2.0.5-r1 amd64, #847571

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.5-r1.ebuild b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
index 19adbc13b4cb..a65a707d3e4e 100644
--- a/net-p2p/deluge/deluge-2.0.5-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Joonas Niilola]

commit:     8e6368aed29be7e21b215df90571f64bfefe563c
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 16:16:57 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu May 26 16:17:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e6368ae

net-p2p/deluge: Stabilize 2.0.5-r1 x86, #847571

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.5-r1.ebuild b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
index a65a707d3e4e..087d6c65dbd4 100644
--- a/net-p2p/deluge/deluge-2.0.5-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Arthur Zamarin]

commit:     893ffeb90704dc2da8f605634798ffb53dca55a4
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 12 10:14:51 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 12 10:14:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893ffeb9

net-p2p/deluge: Keyword 2.0.5-r1 arm64, #834527

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.5-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.5-r1.ebuild b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
index f432594a17df..19adbc13b4cb 100644
--- a/net-p2p/deluge/deluge-2.0.5-r1.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     e430dd62c9b4635c26534b123e263b0523f8b602
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 18:50:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 18:50:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e430dd62

net-p2p/deluge: Stabilize 2.0.3-r11 x86, #828878

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r11.ebuild b/net-p2p/deluge/deluge-2.0.3-r11.ebuild
index b53871607778..ee3ceb2e58a8 100644
--- a/net-p2p/deluge/deluge-2.0.3-r11.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r11.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     a743fca228f8bae6aad4f6ebdf7dc41b33e657a8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 09:20:43 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 09:21:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a743fca2

net-p2p/deluge: amd64 stable wrt bug #828878

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r11.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r11.ebuild b/net-p2p/deluge/deluge-2.0.3-r11.ebuild
index e244b9e1a44c..b53871607778 100644
--- a/net-p2p/deluge/deluge-2.0.3-r11.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     d3626a548719804d2712e24aada8b227b0624028
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 17 00:54:05 2021 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Dec 17 00:54:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3626a54

net-p2p/deluge: deluge is compatible with libtorrent-rasterbar-2

See: https://github.com/deluge-torrent/deluge/pull/312
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/{deluge-9999.ebuild => deluge-2.0.5-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.5-r1.ebuild
similarity index 96%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.5-r1.ebuild
index 567df54ba964..f432594a17df 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.5-r1.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
+	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
@@ -36,7 +36,7 @@ DEPEND="
 	acct-group/deluge
 	acct-user/deluge"
 RDEPEND="
-	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
+	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 567df54ba964..f432594a17df 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
+	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
@@ -36,7 +36,7 @@ DEPEND="
 	acct-group/deluge
 	acct-user/deluge"
 RDEPEND="
-	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
+	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     379d124e5071d35635bd12feecb57afde82b8da4
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 15 19:28:47 2021 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Dec 15 19:29:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=379d124e

net-p2p/deluge: 2.0.5 version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/Manifest            |   1 +
 net-p2p/deluge/deluge-2.0.5.ebuild | 142 +++++++++++++++++++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index e563b1953867..1a6b3e148191 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1,3 @@
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
 DIST deluge-2.0.4.tar.xz 1866260 BLAKE2B cce7c9bfb81ec8c8d61072f74ca939fd07093ce553a755970ff010bb0674b82a4072596d008ea9330e4450f7cc9e190f6b61c6e6023565cd0da198fb82bcaae5 SHA512 3dc3602d8b04f3e4fd2797ea72ce1d2043d9e6e256903b6403369fef075de0281e78c049af049fa8e27b249dd0a5e5071472a73e9905781081f148b29d93bf7b
+DIST deluge-2.0.5.tar.xz 1895268 BLAKE2B 2c815aa9dbbbed5ba780d694b0518f224577b9c370a03712b15c706eda6de55e34b834f624ec18001c9d41b925677b6a001a384691a7ffd9f29c16731a735d4b SHA512 6c2994ca2906fdb92e96aa3534a4ffd5199e9ab6a1b5b12de94c94ec29850cad0cef7546ae1bea5188075fd16a07e584a17bf2f8b5eb1d2b91dee2da1e494588

diff --git a/net-p2p/deluge/deluge-2.0.5.ebuild b/net-p2p/deluge/deluge-2.0.5.ebuild
new file mode 100644
index 000000000000..567df54ba964
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.5.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+DISTUTILS_SINGLE_IMPL=1
+inherit xdg distutils-r1 systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="https://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	libnotify? ( gtk )
+	sound? ( gtk )
+"
+
+DEPEND="
+	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/wheel[${PYTHON_USEDEP}]
+	')
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
+RDEPEND="
+	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/distro[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pyxdg[${PYTHON_USEDEP}]
+		dev-python/rencode[${PYTHON_USEDEP}]
+		dev-python/setproctitle[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		dev-python/mako[${PYTHON_USEDEP}]
+	')"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
+	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+)
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# 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.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
+	fi
+	if use webinterface; then
+		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
+		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
+		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
+		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     1921a4d19ce225d166fae6c8380ec68a397cdceb
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 13 16:55:32 2021 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Dec 13 16:55:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1921a4d1

net-p2p/deluge: 2.0.4 version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/Manifest                                    | 1 +
 net-p2p/deluge/{deluge-9999.ebuild => deluge-2.0.4.ebuild} | 5 +----
 net-p2p/deluge/deluge-9999.ebuild                          | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 1328b39e998e..e563b1953867 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1 +1,2 @@
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480
+DIST deluge-2.0.4.tar.xz 1866260 BLAKE2B cce7c9bfb81ec8c8d61072f74ca939fd07093ce553a755970ff010bb0674b82a4072596d008ea9330e4450f7cc9e190f6b61c6e6023565cd0da198fb82bcaae5 SHA512 3dc3602d8b04f3e4fd2797ea72ce1d2043d9e6e256903b6403369fef075de0281e78c049af049fa8e27b249dd0a5e5071472a73e9905781081f148b29d93bf7b

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.4.ebuild
similarity index 96%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.4.ebuild
index e244b9e1a44c..567df54ba964 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg distutils-r1 systemd
 
@@ -61,9 +61,6 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
 	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
-	"${FILESDIR}/${P}-fix-pickle.patch"
-	"${FILESDIR}/${P}-log.patch"
 )
 
 python_prepare_all() {

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index e244b9e1a44c..567df54ba964 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg distutils-r1 systemd
 
@@ -61,9 +61,6 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
 	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
-	"${FILESDIR}/${P}-fix-pickle.patch"
-	"${FILESDIR}/${P}-log.patch"
 )
 
 python_prepare_all() {

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     1da7b6b2c619ce5403c3a769acaab91a7ef3f58a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 11 01:15:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 11 01:16:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1da7b6b2

net-p2p/deluge: use PYTHON_SINGLE_USEDEP for libtorrent-rasterbar

Finally had to convert older versions (1.2.x) of libtorrent-rasterbar to
python-single-r1 so fixing the dependency here too.

Bug: https://bugs.gentoo.org/828676
Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r11.ebuild
similarity index 92%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r11.ebuild
index be0397a7f781..e244b9e1a44c 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r11.ebuild
@@ -27,18 +27,16 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
-# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
-# instead. It doesn't seem like Deluge supports >= 2 right now.
 DEPEND="
+	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
 RDEPEND="
+	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
@@ -50,7 +48,6 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index be0397a7f781..e244b9e1a44c 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -27,18 +27,16 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
-# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
-# instead. It doesn't seem like Deluge supports >= 2 right now.
 DEPEND="
+	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
 RDEPEND="
+	<net-libs/libtorrent-rasterbar-2.0.0:=[python,${PYTHON_SINGLE_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/distro[${PYTHON_USEDEP}]
@@ -50,7 +48,6 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     d7196bceb6c0d635d0c572c16b8242852dc33203
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 23 07:44:20 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Oct 23 07:44:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7196bce

net-p2p/deluge: x86 stable wrt bug #814926

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r10.ebuild b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
index a12e2b66db7..9880f014ec4 100644
--- a/net-p2p/deluge/deluge-2.0.3-r10.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     ffcad76ce49d24c5af7ab94c409a20c2ec3de5db
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 21 04:40:47 2021 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Oct 21 04:40:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffcad76c

net-p2p/deluge: amd64 stable wrt bug #814926

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r10.ebuild b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
index be0397a7f78..a12e2b66db7 100644
--- a/net-p2p/deluge/deluge-2.0.3-r10.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     4fa7c091f287f44c8b8251f8f5efacf30883d9ec
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 26 04:16:34 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 04:16:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa7c091

net-p2p/deluge: sync live

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-9999.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index af6de067f70..be0397a7f78 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
+inherit xdg distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -126,6 +126,8 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	elog
 	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     a5f55999753d6961ace6af45a1962ce62ea71da1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 26 03:43:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 04:11:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5f55999

net-p2p/deluge: depend on older libtorrent-rasterbar

Deluge can't find libtorrent-rasterbar 2.x and isn't compatible
with it.

(For future, >= libtorrent-rasterbar 2 is now using python-single-r1
(in ~arch, anyway) and we need to therefore use the correct dependency
string, given it doesn't have PYTHON_TARGETS_* anymore, but instead PYTHON_SINGLE_TARGET.)

Reported on the forums at: https://forums.gentoo.org/viewtopic-t-1142958.html

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
similarity index 92%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r10.ebuild
index 0d7b3a317c0..be0397a7f78 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r10.ebuild
@@ -27,9 +27,12 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
 DEPEND="
 	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
@@ -47,6 +50,7 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
@@ -54,7 +58,6 @@ RDEPEND="
 			gnome-base/librsvg
 			libnotify? ( x11-libs/libnotify )
 		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
 	')"
 

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 0d7b3a317c0..af6de067f70 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
+inherit distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -27,9 +27,12 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
+# Note: if/when Deluge supports newer libtorrent-rasterbar >= 2, please
+# move the dependency *outside* of gen_cond_dep and use PYTHON_SINGLE_USEDEP
+# instead. It doesn't seem like Deluge supports >= 2 right now.
 DEPEND="
 	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		dev-python/wheel[${PYTHON_USEDEP}]
 	')
 	dev-util/intltool
@@ -47,6 +50,7 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
 		>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
+		<net-libs/libtorrent-rasterbar-2.0.0[python,${PYTHON_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
@@ -54,7 +58,6 @@ RDEPEND="
 			gnome-base/librsvg
 			libnotify? ( x11-libs/libnotify )
 		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
 		dev-python/mako[${PYTHON_USEDEP}]
 	')"
 
@@ -123,8 +126,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	xdg_pkg_postinst
-
 	elog
 	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     4f80ddfd7c0d65b8ab1a7026a223b45864e4d9b6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 11 20:29:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 11 21:14:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f80ddfd

net-p2p/deluge: [QA] update caches

Reported-by: hanetzer
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r8.ebuild | 4 +++-
 net-p2p/deluge/deluge-9999.ebuild     | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
index 99e877d5e20..19ea2735daf 100644
--- a/net-p2p/deluge/deluge-2.0.3-r8.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
+inherit xdg distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -122,6 +122,8 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	elog
 	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index bdb0681318c..0fe6fe0a53f 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
+inherit xdg distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -121,6 +121,8 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	elog
 	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     9986022244a6151eca9b9870a0dc7ddf78cfaf92
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed May 19 00:06:58 2021 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed May 19 00:07:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99860222

net-p2p/deluge: Python 3.9 compatibility

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r8.ebuild | 2 +-
 net-p2p/deluge/deluge-9999.ebuild     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
index 15bd35c3d1c..d83b42bf73d 100644
--- a/net-p2p/deluge/deluge-2.0.3-r8.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 66ea7d7b94f..c6b27e123d3 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Joonas Niilola]

commit:     cbaaba93248314f61fd4b37b7a4c21d7a8f14085
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 08:15:05 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 08:25:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbaaba93

net-p2p/deluge: drop 2.0.3, 2.0.3, 2.0.3, 2.0.3

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r4.ebuild | 138 ---------------------------------
 net-p2p/deluge/deluge-2.0.3-r5.ebuild | 140 ---------------------------------
 net-p2p/deluge/deluge-2.0.3-r6.ebuild | 141 ----------------------------------
 net-p2p/deluge/deluge-2.0.3-r7.ebuild | 141 ----------------------------------
 4 files changed, 560 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r4.ebuild b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
deleted file mode 100644
index 406971d6876..00000000000
--- a/net-p2p/deluge/deluge-2.0.3-r4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/distro[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		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
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
deleted file mode 100644
index 8e7046e4203..00000000000
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/distro[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-2.0.3-r6.ebuild b/net-p2p/deluge/deluge-2.0.3-r6.ebuild
deleted file mode 100644
index 7136c762814..00000000000
--- a/net-p2p/deluge/deluge-2.0.3-r6.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/distro[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-2.0.3-r7.ebuild b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
deleted file mode 100644
index 66ea7d7b94f..00000000000
--- a/net-p2p/deluge/deluge-2.0.3-r7.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/distro[${PYTHON_MULTI_USEDEP}]
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		dev-python/six[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/mako[${PYTHON_MULTI_USEDEP}]
-	')"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${ED}/usr/bin/deluge-console" || die
-		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${ED}/usr/share/icons/" || die
-		rm "${ED}/usr/bin/deluge-gtk" || die
-		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${ED}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		systemd_newunit "${FILESDIR}/deluge-web.service-3" deluge-web.service
-		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${ED}/usr/bin/deluge-web" || die
-		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     f9e5d2456eb515f7aca7bd82b35a8ab46462bbf8
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 12:04:36 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 12:04:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9e5d245

net-p2p/deluge: Stabilize 2.0.3-r8 amd64, #771267

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
index 66cc9921ea3..15bd35c3d1c 100644
--- a/net-p2p/deluge/deluge-2.0.3-r8.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     52c66f4b10c57a74c8e596cff738106e083a5fbc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 19 02:39:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 02:39:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c66f4b

net-p2p/deluge: Stabilize 2.0.3-r8 x86, #771267

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
index 22abae5c709..66cc9921ea3 100644
--- a/net-p2p/deluge/deluge-2.0.3-r8.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sam James]

commit:     c765bdd283714852727ab202dd6b44c32cebf22d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 21:49:21 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 21:49:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c765bdd2

net-p2p/deluge: ppc keyworded (bug #748564)

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r8.ebuild b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
index 8c09d112b65..919ceb56847 100644
--- a/net-p2p/deluge/deluge-2.0.3-r8.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r8.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     a2896777300cd3a3b7b68c248bd4a5756fb6ca55
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 13:57:18 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 13:58:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2896777

net-p2p/deluge: Fix "cannot remove deluge-console"

Closes: https://bugs.gentoo.org/730196
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../{deluge-9999.ebuild => deluge-2.0.3-r7.ebuild}    | 19 ++++++++++---------
 net-p2p/deluge/deluge-9999.ebuild                     | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
similarity index 89%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r7.ebuild
index 121cab58004..2caebb8c9d1 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -61,6 +61,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
 	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
 )
 
 python_prepare_all() {
@@ -91,15 +92,15 @@ python_install_all() {
 	distutils-r1_python_install_all
 	if ! use console ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
 	fi
 	if ! use gtk ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
 	fi
 	if use webinterface; then
 		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
@@ -108,8 +109,8 @@ python_install_all() {
 		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
 	else
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
 	fi
 	newinitd "${FILESDIR}"/deluged.init-2 deluged
 	newconfd "${FILESDIR}"/deluged.conf-2 deluged

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 121cab58004..2caebb8c9d1 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -61,6 +61,7 @@ RDEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
 	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
+	"${FILESDIR}/${PN}-2.0.3-gettext.patch"
 )
 
 python_prepare_all() {
@@ -91,15 +92,15 @@ python_install_all() {
 	distutils-r1_python_install_all
 	if ! use console ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/console/" || die
-		rm "${D}/usr/bin/deluge-console" || die
-		rm "${D}/usr/share/man/man1/deluge-console.1" ||die
+		rm "${ED}/usr/bin/deluge-console" || die
+		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
 	fi
 	if ! use gtk ; then
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/gtk3/" || die
-		rm -r "${D}/usr/share/icons/" || die
-		rm "${D}/usr/bin/deluge-gtk" || die
-		rm "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm "${D}/usr/share/applications/deluge.desktop" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm "${ED}/usr/bin/deluge-gtk" || die
+		rm "${ED}/usr/share/man/man1/deluge-gtk.1" || die
+		rm "${ED}/usr/share/applications/deluge.desktop" || die
 	fi
 	if use webinterface; then
 		newinitd "${FILESDIR}/deluge-web.init-2" deluge-web
@@ -108,8 +109,8 @@ python_install_all() {
 		systemd_install_serviced "${FILESDIR}/deluge-web.service.conf"
 	else
 		rm -r "${D}/$(python_get_sitedir)/deluge/ui/web/" || die
-		rm "${D}/usr/bin/deluge-web" || die
-		rm "${D}/usr/share/man/man1/deluge-web.1" || die
+		rm "${ED}/usr/bin/deluge-web" || die
+		rm "${ED}/usr/share/man/man1/deluge-web.1" || die
 	fi
 	newinitd "${FILESDIR}"/deluged.init-2 deluged
 	newconfd "${FILESDIR}"/deluged.conf-2 deluged

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sergei Trofimovich]

commit:     974703c0209eb462a9e6009635f1b35e62cb8ef5
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed May  6 06:39:41 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed May  6 06:39:41 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=974703c0

net-p2p/deluge: keyworded 2.0.3-r5 for ppc, bug #705486

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 7f42f3bb824..6faac8588ac 100644
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~sparc x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Mikle Kolyada]

commit:     bf5e684331494b2208705250ea24f13f2570d0dd
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 13:45:03 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 13:48:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5e6843

net-p2p/deluge: Drop old (py27-only)

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-p2p/deluge/Manifest                |   1 -
 net-p2p/deluge/deluge-1.3.15-r5.ebuild | 142 ---------------------------------
 net-p2p/deluge/deluge-1.3.15-r6.ebuild | 134 -------------------------------
 net-p2p/deluge/deluge-1.3.15-r7.ebuild | 133 ------------------------------
 net-p2p/deluge/deluge-1.3.9999.ebuild  | 134 -------------------------------
 5 files changed, 544 deletions(-)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 437ebf60a93..1328b39e998 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1 @@
-DIST deluge-1.3.15.tar.bz2 1775913 BLAKE2B 9d5224766051d52b6e075dcafab5716793081c78ba69da616fc98f2c463ddc7676b2c2ce8f54b81e1480cf4344582245733033cf5927a9692bc43ec0a23f0001 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda
 DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e8b2c494bc8a3a03a3b7a03050eed894de84d7a26a416417b0c874a82809398fcaf57972b1056e2fcceb9d092d SHA512 3abec24495b22ec10649865c7ce7c3271224c7d25c0647b43f3c177b7ccb45d4c5c593f8c89d8bc8eac85ae5dc737f9960827587912dd527bb96100304a7d480

diff --git a/net-p2p/deluge/deluge-1.3.15-r5.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
deleted file mode 100644
index bb90b884827..00000000000
--- a/net-p2p/deluge/deluge-1.3.15-r5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-CDEPEND="
-	$(python_gen_cond_dep '
-		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${CDEPEND}
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-1.3.15-r6.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
deleted file mode 100644
index 58e3297a8a9..00000000000
--- a/net-p2p/deluge/deluge-1.3.15-r6.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-DEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool"
-RDEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-1.3.15-r7.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
deleted file mode 100644
index 018c45c4ff6..00000000000
--- a/net-p2p/deluge/deluge-1.3.15-r7.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-DEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
deleted file mode 100644
index 33dd3918e4e..00000000000
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 1.3.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=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-)
-
-DEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-	')
-	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="
-	$(python_gen_cond_dep '
-		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
-		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
-		)
-		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     c194485a1f4f89e356a4f8a2d192c1e8fe30114d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 11:40:43 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 11:40:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c194485a

net-p2p/deluge: x86 stable wrt bug #704986

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 1afeb0acefd..7f42f3bb824 100644
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     cc0b30e3e2f5d80f814134a8c02900d0e6c2c3b2
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 14:36:51 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 14:43:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0b30e3

net-p2p/deluge: Python 3.8 compatibility

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r5.ebuild | 2 +-
 net-p2p/deluge/deluge-9999.ebuild     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index cd95bd34399..1afeb0acefd 100644
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 9bf5ba2d72b..121cab58004 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Sergei Trofimovich]

commit:     bbcd8902c62d25779056163861f7a5a93fc271c0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Apr 14 17:34:02 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 21:05:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbcd8902

net-p2p/deluge: keyworded 2.0.3-r5 for sparc, bug #705486

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index f66dc055018..cd95bd34399 100644
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     7f3158e874904e547bed32548c9344a64946f266
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 26 17:29:39 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 17:35:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3158e8

net-p2p/deluge: Flatten twisted dep

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.15-r5.ebuild | 7 +------
 net-p2p/deluge/deluge-1.3.15-r6.ebuild | 7 +------
 net-p2p/deluge/deluge-1.3.15-r7.ebuild | 7 +------
 net-p2p/deluge/deluge-1.3.9999.ebuild  | 7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15-r5.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
index 61514eb8e1d..bb90b884827 100644
--- a/net-p2p/deluge/deluge-1.3.15-r5.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
@@ -46,12 +46,7 @@ RDEPEND="${CDEPEND}
 		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-			(
-			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-			)
-		)
+		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )

diff --git a/net-p2p/deluge/deluge-1.3.15-r6.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
index f044210962a..58e3297a8a9 100644
--- a/net-p2p/deluge/deluge-1.3.15-r6.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
@@ -45,12 +45,7 @@ RDEPEND="
 		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-			(
-			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-			)
-		)
+		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )

diff --git a/net-p2p/deluge/deluge-1.3.15-r7.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
index 13817ba74ca..018c45c4ff6 100644
--- a/net-p2p/deluge/deluge-1.3.15-r7.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
@@ -46,12 +46,7 @@ RDEPEND="
 		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-			(
-			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-			)
-		)
+		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index af10c260e9f..33dd3918e4e 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -47,12 +47,7 @@ RDEPEND="
 		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
-		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
-			(
-			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
-			)
-		)
+		>=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
 		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
 		gtk? (
 			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     c7a98e33f14336ead6b136f01581823b265edd80
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 13:19:35 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 13:19:35 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a98e33

net-p2p/deluge: amd64 stable wrt bug #704986

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 3cdc92e94de..f66dc055018 100644
--- a/net-p2p/deluge/deluge-2.0.3-r5.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     7f5848e0a74dcdf5125e2c752d602d495fcdcbd9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 06:55:43 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:46:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5848e0

net-p2p/deluge: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...ge-1.3.15-r2.ebuild => deluge-1.3.15-r5.ebuild} | 46 ++++++++++----------
 ...ge-1.3.15-r3.ebuild => deluge-1.3.15-r6.ebuild} | 49 ++++++++++++----------
 ...ge-1.3.15-r4.ebuild => deluge-1.3.15-r7.ebuild} | 49 ++++++++++++----------
 net-p2p/deluge/deluge-1.3.9999.ebuild              | 49 ++++++++++++----------
 ...luge-2.0.3-r2.ebuild => deluge-2.0.3-r4.ebuild} | 49 ++++++++++++----------
 ...luge-2.0.3-r3.ebuild => deluge-2.0.3-r5.ebuild} | 49 ++++++++++++----------
 net-p2p/deluge/deluge-9999.ebuild                  | 49 ++++++++++++----------
 7 files changed, 187 insertions(+), 153 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
similarity index 81%
rename from net-p2p/deluge/deluge-1.3.15-r2.ebuild
rename to net-p2p/deluge/deluge-1.3.15-r5.ebuild
index f49c58d5c41..61514eb8e1d 100644
--- a/net-p2p/deluge/deluge-1.3.15-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -34,30 +34,34 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
+CDEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+	')"
 DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
 RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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}]
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(

diff --git a/net-p2p/deluge/deluge-1.3.15-r3.ebuild b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
similarity index 78%
rename from net-p2p/deluge/deluge-1.3.15-r3.ebuild
rename to net-p2p/deluge/deluge-1.3.15-r6.ebuild
index d3ef7813a7a..f044210962a 100644
--- a/net-p2p/deluge/deluge-1.3.15-r3.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,29 +33,34 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(

diff --git a/net-p2p/deluge/deluge-1.3.15-r4.ebuild b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
similarity index 78%
rename from net-p2p/deluge/deluge-1.3.15-r4.ebuild
rename to net-p2p/deluge/deluge-1.3.15-r7.ebuild
index d938267bcd8..13817ba74ca 100644
--- a/net-p2p/deluge/deluge-1.3.15-r4.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -32,31 +32,36 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 1be3b571988..af10c260e9f 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -33,31 +33,36 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		|| ( >=dev-python/twisted-16.0.0[${PYTHON_MULTI_USEDEP}]
+			(
+			>=dev-python/twisted-core-13.0[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/twisted-web-13.0[${PYTHON_MULTI_USEDEP}]
+			)
 		)
-	)
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/pygtk-2.12[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( dev-python/notify-python[${PYTHON_MULTI_USEDEP}] )
+		)
+		webinterface? ( dev-python/mako[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 python_prepare_all() {
 	local args=(

diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
similarity index 77%
rename from net-p2p/deluge/deluge-2.0.3-r2.ebuild
rename to net-p2p/deluge/deluge-2.0.3-r4.ebuild
index f3c58d701a9..cf9714d1618 100644
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r4.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"

diff --git a/net-p2p/deluge/deluge-2.0.3-r3.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
similarity index 77%
rename from net-p2p/deluge/deluge-2.0.3-r3.ebuild
rename to net-p2p/deluge/deluge-2.0.3-r5.ebuild
index 8b3cbf5b4f9..3cdc92e94de 100644
--- a/net-p2p/deluge/deluge-2.0.3-r3.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index d1806e7558e..9bf5ba2d72b 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -27,31 +27,36 @@ REQUIRED_USE="
 	sound? ( gtk )
 "
 
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	$(python_gen_cond_dep '
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
 	acct-group/deluge
 	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/distro[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+		dev-python/rencode[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/twisted-17.1.0[crypt,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/zope-interface-4.4.2[${PYTHON_MULTI_USEDEP}]
+		geoip? ( dev-python/geoip-python[${PYTHON_MULTI_USEDEP}] )
+		gtk? (
+			sound? ( dev-python/pygame[${PYTHON_MULTI_USEDEP}] )
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			gnome-base/librsvg
+			libnotify? ( x11-libs/libnotify )
+		)
+		net-libs/libtorrent-rasterbar[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/mako[${PYTHON_MULTI_USEDEP}]
+	')"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     fa249253fab9eef370382b74ca7c140f63c20850
Author:     Paolo Pedroni <PPed72 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Jan 28 15:21:31 2020 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 15:31:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa249253

add forgotten ~arm keyword after update

Bug: https://bugs.gentoo.org/705486
Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>
Closes: https://github.com/gentoo/gentoo/pull/14485
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r3.ebuild b/net-p2p/deluge/deluge-2.0.3-r3.ebuild
index d1806e7558e..8b3cbf5b4f9 100644
--- a/net-p2p/deluge/deluge-2.0.3-r3.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r3.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Mikle Kolyada]

commit:     9bf31ad0b79bc6e0992c1aee65ec256b447dea35
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 11:41:10 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 11:41:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf31ad0

net-p2p/deluge: Add ~arm keyword wrt bug #705486

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
index dd90402c4e2..f3c58d701a9 100644
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Richard Freeman]

commit:     1920a10fb5bdcff8226016ddf023a53e0d11578c
Author:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 23:56:46 2020 +0000
Commit:     Richard Freeman <rich0 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 23:56:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1920a10f

net-p2p/deluge: amd64 stable

Bug: https://bugs.gentoo.org/704986
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Richard Freeman <rich0 <AT> gentoo.org>

 net-p2p/deluge/deluge-2.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-2.0.3-r2.ebuild b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
index fc0402eb722..dd90402c4e2 100644
--- a/net-p2p/deluge/deluge-2.0.3-r2.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Pacho Ramos]

commit:     da7e8aeaed17fb4ab0fc9857d160c9635de598ab
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 17:28:41 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 17:28:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7e8aea

net-p2p/deluge: Drop python2_7 to stop relying on ..

pygame with python2 support and others

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

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

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
similarity index 99%
copy from net-p2p/deluge/deluge-9999.ebuild
copy to net-p2p/deluge/deluge-2.0.3-r2.ebuild
index 9d936b780a0..01bdfda12a2 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 9d936b780a0..01bdfda12a2 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     3b630e82b3c0afe314d069c69bef6e82b74d2396
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 21:17:18 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=3b630e82

net-p2p/deluge: Cleanup old version

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

 net-p2p/deluge/deluge-2.0.3.ebuild | 133 -------------------------------------
 1 file changed, 133 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3.ebuild b/net-p2p/deluge/deluge-2.0.3.ebuild
deleted file mode 100644
index 849209d96ba..00000000000
--- a/net-p2p/deluge/deluge-2.0.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="https://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/2.0/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
-"
-
-DEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool
-	dev-python/wheel[${PYTHON_USEDEP}]
-	acct-group/deluge
-	acct-user/deluge"
-RDEPEND="dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/twisted-17.1.0[crypt,${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gtk? (
-		sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( x11-libs/libnotify )
-	)
-	net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	if use webinterface; then
-		newinitd "${FILESDIR}/deluge-web.init" deluge-web
-		newconfd "${FILESDIR}/deluge-web.conf" deluge-web
-		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
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

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

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     7aa9c9d6f66dbad63f94bcb2e8ac44dd0a493f9d
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 16:18:30 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 16:18:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aa9c9d6

net-p2p/deluge: Python 3.7 compatibility

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

 net-p2p/deluge/deluge-2.0.3.ebuild | 2 +-
 net-p2p/deluge/deluge-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-2.0.3.ebuild b/net-p2p/deluge/deluge-2.0.3.ebuild
index f347e4c3ee3..879207fa8b3 100644
--- a/net-p2p/deluge/deluge-2.0.3.ebuild
+++ b/net-p2p/deluge/deluge-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index f347e4c3ee3..879207fa8b3 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     c715e2529db9e3731132b08d05d4bac02422c6ea
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 20:09:26 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 14:56:57 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c715e252

net-p2p/deluge: Use GLEP 81 for user/group instead of user eclass

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../{deluge-1.3.9999.ebuild => deluge-1.3.15-r4.ebuild}   | 15 +++++++--------
 net-p2p/deluge/deluge-1.3.9999.ebuild                     |  8 ++++----
 net-p2p/deluge/deluge-9999.ebuild                         | 10 +++++-----
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.15-r4.ebuild
similarity index 94%
copy from net-p2p/deluge/deluge-1.3.9999.ebuild
copy to net-p2p/deluge/deluge-1.3.15-r4.ebuild
index 5abf8ffb3d0..d938267bcd8 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r4.ebuild
@@ -5,16 +5,14 @@ EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
+inherit distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://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"
+	EGIT_REPO_URI="https://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
@@ -31,11 +29,14 @@ REQUIRED_USE="
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
 DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
 RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -112,8 +113,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 	elog
 	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 5abf8ffb3d0..1be3b571988 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 systemd user
+inherit distutils-r1 systemd
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -35,7 +35,9 @@ PATCHES=(
 
 DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
 RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -112,8 +114,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 	elog
 	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 7d98de7bce8..9989834d997 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,7 +6,7 @@ EAPI="6"
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
 PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
+inherit distutils-r1 eutils systemd l10n
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -36,7 +36,9 @@ PATCHES=(
 CDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python,${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
+	dev-util/intltool
+	acct-group/deluge
+	acct-user/deluge"
 RDEPEND="${CDEPEND}
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
@@ -117,8 +119,6 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 	elog
 	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Pacho Ramos]

commit:     4b0368c3221a8023f69b7d76704d793a6190e97c
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 08:24:36 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 08:30:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0368c3

net-p2p/deluge: amd64 stable, bug #681612

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.15-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-1.3.15-r3.ebuild b/net-p2p/deluge/deluge-1.3.15-r3.ebuild
index 2245028f990..1d400014e3b 100644
--- a/net-p2p/deluge/deluge-1.3.15-r3.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Craig Andrews]

commit:     dd83699d620548c1e6fe2cd14cd5f51058b1dac5
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Jan 23 10:58:20 2019 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Jan 24 23:22:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd83699d

net-p2p/deluge: restrict libtorrent-rasterbar dependency

net-libs/libtorrent-rasterbar-1.2 removed several deprecated
functions needed by net-p2p deluge. We thus restrict the
dependency to be <net-libs/libtorrent-rasterbar-1.2

Also a few cleanups already discussed for deluge-9999

Closes: https://bugs.gentoo.org/676056
Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10892
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 ...uge-1.3.9999.ebuild => deluge-1.3.15-r3.ebuild} | 23 +++++++---------------
 net-p2p/deluge/deluge-1.3.9999.ebuild              | 19 +++++-------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.15-r3.ebuild
similarity index 85%
copy from net-p2p/deluge/deluge-1.3.9999.ebuild
copy to net-p2p/deluge/deluge-1.3.15-r3.ebuild
index a32833a4f9f..2245028f990 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r3.ebuild
@@ -1,21 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
+inherit distutils-r1 systemd user
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://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=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
@@ -32,13 +30,13 @@ REQUIRED_USE="
 "
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
 )
 
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
+DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
-RDEPEND="${CDEPEND}
+RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
@@ -71,13 +69,6 @@ python_prepare_all() {
 	)
 	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
 
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
 	distutils-r1_python_prepare_all
 }
 

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index a32833a4f9f..5abf8ffb3d0 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
+inherit distutils-r1 systemd user
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -34,11 +33,10 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
+DEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
-RDEPEND="${CDEPEND}
+RDEPEND="<net-libs/libtorrent-rasterbar-1.2[python,${PYTHON_USEDEP}]
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
@@ -71,13 +69,6 @@ python_prepare_all() {
 	)
 	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
 
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
 	distutils-r1_python_prepare_all
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Aaron Bauman]

commit:     4325546cb0204a0345f682e4e9bd3a643dafd4b6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat May 19 07:50:01 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 20 00:14:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4325546c

net-p2p/deluge: use HTTPS

Closes: https://github.com/gentoo/gentoo/pull/8478

 net-p2p/deluge/deluge-1.3.15-r2.ebuild | 4 ++--
 net-p2p/deluge/deluge-1.3.9999.ebuild  | 4 ++--
 net-p2p/deluge/deluge-9999.ebuild      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
index ab375feed8a..f49c58d5c41 100644
--- a/net-p2p/deluge/deluge-1.3.15-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
@@ -9,7 +9,7 @@ PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu
 inherit distutils-r1 eutils systemd user l10n
 
 DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
+HOMEPAGE="https://deluge-torrent.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -138,6 +138,6 @@ pkg_postinst() {
 	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
 	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
 	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 4c516d7de28..a32833a4f9f 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -9,7 +9,7 @@ PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu
 inherit distutils-r1 eutils systemd user l10n
 
 DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
+HOMEPAGE="https://deluge-torrent.org/"
 
 if [[ ${PV} == 1.3.9999 ]]; then
 	inherit git-r3
@@ -138,6 +138,6 @@ pkg_postinst() {
 	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
 	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
 	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index af4e8728bc1..7d98de7bce8 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -9,7 +9,7 @@ PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu
 inherit distutils-r1 eutils systemd user l10n
 
 DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
+HOMEPAGE="https://deluge-torrent.org/"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -134,6 +134,6 @@ pkg_postinst() {
 	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
 	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
 	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog "For more information look at https://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Andreas Sturmlechner]

commit:     9e850e04d10a67f0ecffc425f6cd040132b4551b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 21:44:26 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 21:48:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e850e04

net-p2p/deluge: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-p2p/deluge/deluge-1.3.15-r1.ebuild | 143 ---------------------------------
 net-p2p/deluge/deluge-1.3.15.ebuild    | 142 --------------------------------
 2 files changed, 285 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15-r1.ebuild b/net-p2p/deluge/deluge-1.3.15-r1.ebuild
deleted file mode 100644
index 1f182af8f3e..00000000000
--- a/net-p2p/deluge/deluge-1.3.15-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
-)
-
-CDEPEND="<net-libs/libtorrent-rasterbar-1.1[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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 )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-1.3.15.ebuild b/net-p2p/deluge/deluge-1.3.15.ebuild
deleted file mode 100644
index 24f0bebb7fe..00000000000
--- a/net-p2p/deluge/deluge-1.3.15.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-)
-
-CDEPEND="<net-libs/libtorrent-rasterbar-1.1[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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 )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Michał Górny]

commit:     462d930f519c01a63ae65f62cd6ae1c9bc9dd6f9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 11 11:07:45 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb 11 11:07:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462d930f

net-p2p/deluge: Remove useless maintainer <description/>

Remove useless/redundant maintainer <description/>. It does not benefit
bug wrangling, and only wastes developer's time on reading it. Few tips:

- assignee/CC is implied by ordering, there is no reason to repeat it,
- we know that maintainer is maintainer (la la la la la),
- most of adjectives for maintainer are of no value and/or are obvious.

 net-p2p/deluge/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index cbc1f2a0635..5a74432b6fe 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -4,12 +4,10 @@
 	<maintainer type="person">
 		<email>paolo.pedroni@iol.it</email>
 		<name>Paolo Pedroni</name>
-		<description>Proxied Maintainer, assign bugs to him</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
-		<description>Proxy Maintainer, CC on bugs</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Andreas Sturmlechner]

commit:     2895e463bbc04c17e05806075abffcd47046605e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  4 17:07:18 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  4 17:38:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2895e463

net-p2p/deluge: Drop ~arm <1.3.15-r2, restore ~arm >=1.3.15-r2

This was holding up net-libs/libtorrent-rasterbar cleanup.
Cleanup duplicate KEYWORDS line in 9999 conditional block.

Bug: https://bugs.gentoo.org/636860
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-p2p/deluge/deluge-1.3.15-r1.ebuild | 5 ++---
 net-p2p/deluge/deluge-1.3.15-r2.ebuild | 5 ++---
 net-p2p/deluge/deluge-1.3.15.ebuild    | 5 ++---
 net-p2p/deluge/deluge-1.3.9999.ebuild  | 3 +--
 net-p2p/deluge/deluge-9999.ebuild      | 3 +--
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15-r1.ebuild b/net-p2p/deluge/deluge-1.3.15-r1.ebuild
index e76bbab1485..1f182af8f3e 100644
--- a/net-p2p/deluge/deluge-1.3.15-r1.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,10 +16,9 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
-	KEYWORDS="~amd64 ~x86"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
index 5d79bc528cc..831b0f5a248 100644
--- a/net-p2p/deluge/deluge-1.3.15-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,10 +16,9 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
-	KEYWORDS="~amd64 ~x86"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-p2p/deluge/deluge-1.3.15.ebuild b/net-p2p/deluge/deluge-1.3.15.ebuild
index 4c92716328b..24f0bebb7fe 100644
--- a/net-p2p/deluge/deluge-1.3.15.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,10 +16,9 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
-	KEYWORDS="amd64 x86"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+	KEYWORDS="amd64 ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 759e6ef8744..4c516d7de28 100644
--- a/net-p2p/deluge/deluge-1.3.9999.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,6 @@ if [[ ${PV} == 1.3.9999 ]]; then
 		http://git.deluge-torrent.org/${PN}"
 	EGIT_BRANCH="1.3-stable"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 42a1addef2d..af4e8728bc1 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,6 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Ulrich Müller]

commit:     133c87a3b4bbffe52e23e89b0ab72dd560f562c6
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 14:21:01 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 15:38:30 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133c87a3

net-p2p/deluge: Remove unused linguas_* USE flags from metadata.

These are not needed, because LINGUAS is no longer in USE_EXPAND.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-p2p/deluge/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 33afb6123b9..cbc1f2a0635 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -19,8 +19,5 @@
 	<flag name="webinterface">Install dependencies needed for the web
 		interface</flag>
 	<flag name="console">Enable default console UI</flag>
-	<flag name="linguas_nap">Neapolitan locale</flag>
-	<flag name="linguas_iu">Inuktitut locale</flag>
-	<flag name="linguas_pms">Piemontese locale</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     ce1b6a743f2153ee351873382a4ddf4df79c0dac
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Nov  8 11:41:53 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 22:13:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce1b6a74

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

Bug: https://bugs.gentoo.org/636860

 net-p2p/deluge/deluge-1.3.15-r2.ebuild | 144 +++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

diff --git a/net-p2p/deluge/deluge-1.3.15-r2.ebuild b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
new file mode 100644
index 00000000000..5d79bc528cc
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+	"${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch"
+)
+
+CDEPEND="net-libs/libtorrent-rasterbar[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	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-python/geoip-python[${PYTHON_USEDEP}] )
+	gtk? (
+		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[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# 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.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     4f871b6795b07cf61dba87992172daacc46fe32a
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Nov  8 11:43:46 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 22:13:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f871b67

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

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

 net-p2p/deluge/deluge-1.3.9999.ebuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.9999.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
index 8055972cdb3..759e6ef8744 100644
--- 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}]

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     581765878084af1a6fabfb7341c7c7c1d4afad30
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 08:45:00 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 08:45:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58176587

net-p2p/deluge: Cleanup of 1.3.14

Security cleanup

Gentoo-Proxied-Maintainer: Paolo Pedroni
Gentoo-Bug: 618872

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 net-p2p/deluge/Manifest             |   1 -
 net-p2p/deluge/deluge-1.3.14.ebuild | 143 ------------------------------------
 2 files changed, 144 deletions(-)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index d33634ac1e3..b5c707547e8 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1 @@
-DIST deluge-1.3.14.tar.bz2 1774160 SHA256 c38ab40d71bf5c1b500958b2679fdfd3c45121860f1fade69b654ebd94e1ed09 SHA512 5bf37b647a84b31c4c5fa660a7a9b1f20eaac25dfe314dbc771d3ca40259e0f994ebfc6925e81902698b04291de1cae8efb0e246f1aca631bdbcdfda51b9ba42 WHIRLPOOL 76fc95acec3366f75f26e66207bb31a51f9ac55eb8882e106ca9086170973378bd796db55b2acdb70fa38467ff0f67c5822b7f0692218b4b603a2e77bf6b7ce7
 DIST deluge-1.3.15.tar.bz2 1775913 SHA256 dcf823131be56c2180814e8def11496aaaf700710b5694867ba9f057615ac790 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda WHIRLPOOL 93f3b2c86b983ecea7b001f0b58bd6e904ecc4c11c718286885d82b09f0068c4bf347b03be12edfe77677604d3af3ca9a68e8a2a08d696ff16f5385eb43c464f

diff --git a/net-p2p/deluge/deluge-1.3.14.ebuild b/net-p2p/deluge/deluge-1.3.14.ebuild
deleted file mode 100644
index 537cc88b26e..00000000000
--- a/net-p2p/deluge/deluge-1.3.14.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-)
-
-CDEPEND=">=net-libs/libtorrent-rasterbar-0.16.17[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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 )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     81dda77427a6f0e9159441ee4020f8b3efbfa4bf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 10:19:25 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 10:19:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81dda774

net-p2p/deluge: x86 stable wrt bug #618872

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15.ebuild b/net-p2p/deluge/deluge-1.3.15.ebuild
index f6ea63d4092..4c92716328b 100644
--- a/net-p2p/deluge/deluge-1.3.15.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15.ebuild
@@ -16,10 +16,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     46eecdcfa80f23c350f20b6db551b8b5aa5fcf02
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 09:44:28 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 09:44:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46eecdcf

net-p2p/deluge: amd64 stable wrt bug #618872

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.15.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.15.ebuild b/net-p2p/deluge/deluge-1.3.15.ebuild
index 39d19840892..f6ea63d4092 100644
--- a/net-p2p/deluge/deluge-1.3.15.ebuild
+++ b/net-p2p/deluge/deluge-1.3.15.ebuild
@@ -16,10 +16,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     41ab815fe8887c360dd98fd3d8dec9cbf0ddb11d
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  6 18:24:10 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Jun  6 18:24:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ab815f

net-p2p/deluge: New version 1.3.15

Proxied commit
Thanks-To: Paolo Pedroni

Gentoo-Bug: 619812
Gentoo-Bug: 618872

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 net-p2p/deluge/Manifest             |   1 +
 net-p2p/deluge/deluge-1.3.15.ebuild | 143 ++++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 115a834eeab..d33634ac1e3 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1 +1,2 @@
 DIST deluge-1.3.14.tar.bz2 1774160 SHA256 c38ab40d71bf5c1b500958b2679fdfd3c45121860f1fade69b654ebd94e1ed09 SHA512 5bf37b647a84b31c4c5fa660a7a9b1f20eaac25dfe314dbc771d3ca40259e0f994ebfc6925e81902698b04291de1cae8efb0e246f1aca631bdbcdfda51b9ba42 WHIRLPOOL 76fc95acec3366f75f26e66207bb31a51f9ac55eb8882e106ca9086170973378bd796db55b2acdb70fa38467ff0f67c5822b7f0692218b4b603a2e77bf6b7ce7
+DIST deluge-1.3.15.tar.bz2 1775913 SHA256 dcf823131be56c2180814e8def11496aaaf700710b5694867ba9f057615ac790 SHA512 1d0f93a8c5081b807a390f79101d7f26751b0dfc47efe4c3573541014f9e5969461e2d421d17646c17fb81eb4f66f25f5ddce63b9bd226989adb7d7506146bda WHIRLPOOL 93f3b2c86b983ecea7b001f0b58bd6e904ecc4c11c718286885d82b09f0068c4bf347b03be12edfe77677604d3af3ca9a68e8a2a08d696ff16f5385eb43c464f

diff --git a/net-p2p/deluge/deluge-1.3.15.ebuild b/net-p2p/deluge/deluge-1.3.15.ebuild
new file mode 100644
index 00000000000..39d19840892
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.15.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+)
+
+CDEPEND="<net-libs/libtorrent-rasterbar-1.1[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	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 )
+	gtk? (
+		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[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# 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.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     d78e7d6198a91cfe59b41d7aca6f673db321957d
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 19:19:23 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 19:20:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d78e7d61

net-p2p/deluge: Cleanup old versions

Gentoo-Bug: 612144

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-p2p/deluge/Manifest                |   2 -
 net-p2p/deluge/deluge-1.3.12.ebuild    |  87 --------------------
 net-p2p/deluge/deluge-1.3.13-r2.ebuild | 143 ---------------------------------
 net-p2p/deluge/metadata.xml            |   2 -
 4 files changed, 234 deletions(-)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 83b07cd87e0..115a834eeab 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,3 +1 @@
-DIST deluge-1.3.12.tar.bz2 1772567 SHA256 565745b2a3f0567fc007dbdfeea2aa96a6bebd7dbdda2ec932a3017c66613c93 SHA512 bcb909f70d407ec766a609a1525f48b0f0ce18217049ff05dfd03b3681bdc021a446afa265b288181c644b1e47c710f41d17b1244c3b991818b947a51b97eb74 WHIRLPOOL 683e6d197ee617646ffc716738c58f479df5dc05cfc20d8295c283f9b98da309490ec582becf0d584c28a957d8bcbf1dc7b9ab4b06879d1fd338bc88a0bda29b
-DIST deluge-1.3.13.tar.bz2 1769747 SHA256 37b3a22cea3ce8b87183f5d2d972d70db6e61825ea1c6bbc052e0120c49ee8c5 SHA512 8ff904e55d0c058f456df16b8bf07ca3ead266e817435f123b34cd2a334ef1fe46baaeb95e1cce3be3f5a52768b8352ea3e61151308e9002bfb40ef872659703 WHIRLPOOL b3804d3b5fcd632388aea19a3e9aa368748aa50b7abf482d293011bae3d4c78a3a3b2879b3bb6c0cb788721794d0c3146516f67364f6c89ed42cdb358c5d1807
 DIST deluge-1.3.14.tar.bz2 1774160 SHA256 c38ab40d71bf5c1b500958b2679fdfd3c45121860f1fade69b654ebd94e1ed09 SHA512 5bf37b647a84b31c4c5fa660a7a9b1f20eaac25dfe314dbc771d3ca40259e0f994ebfc6925e81902698b04291de1cae8efb0e246f1aca631bdbcdfda51b9ba42 WHIRLPOOL 76fc95acec3366f75f26e66207bb31a51f9ac55eb8882e106ca9086170973378bd796db55b2acdb70fa38467ff0f67c5822b7f0692218b4b603a2e77bf6b7ce7

diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
deleted file mode 100644
index 211adf6ab7f..00000000000
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 eutils systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="geoip gtk libnotify setproctitle sound webinterface"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND=">=net-libs/libtorrent-rasterbar-0.14.9[python]
-	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[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	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
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}"/deluged.init deluged
-	newconfd "${FILESDIR}"/deluged.conf deluged
-	systemd_dounit "${FILESDIR}"/deluged.service
-	systemd_dounit "${FILESDIR}"/deluge-web.service
-}
-
-pkg_postinst() {
-	elog
-	elog "If after upgrading it doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-1.3.13-r2.ebuild b/net-p2p/deluge/deluge-1.3.13-r2.ebuild
deleted file mode 100644
index 537cc88b26e..00000000000
--- a/net-p2p/deluge/deluge-1.3.13-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS="amd64 x86"
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-)
-
-CDEPEND=">=net-libs/libtorrent-rasterbar-0.16.17[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	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 )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index d59b3c43b4e..33afb6123b9 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -16,8 +16,6 @@
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
 <use>
-	<flag name="setproctitle">Install dependencies needed for beautifying
-		the process name</flag>
 	<flag name="webinterface">Install dependencies needed for the web
 		interface</flag>
 	<flag name="console">Enable default console UI</flag>

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     36fa021d53729b7a9f6883729d5255e71f092544
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 12:37:55 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 12:38:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36fa021d

net-p2p/deluge: Version bump to 1.3.14

Straight version bump for security vulns

Proxied-Maintainer: Paolo Pedroni
Gentoo-Bug: 612144

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-p2p/deluge/Manifest             |   1 +
 net-p2p/deluge/deluge-1.3.14.ebuild | 143 ++++++++++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 351d6c94d17..83b07cd87e0 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1,3 @@
 DIST deluge-1.3.12.tar.bz2 1772567 SHA256 565745b2a3f0567fc007dbdfeea2aa96a6bebd7dbdda2ec932a3017c66613c93 SHA512 bcb909f70d407ec766a609a1525f48b0f0ce18217049ff05dfd03b3681bdc021a446afa265b288181c644b1e47c710f41d17b1244c3b991818b947a51b97eb74 WHIRLPOOL 683e6d197ee617646ffc716738c58f479df5dc05cfc20d8295c283f9b98da309490ec582becf0d584c28a957d8bcbf1dc7b9ab4b06879d1fd338bc88a0bda29b
 DIST deluge-1.3.13.tar.bz2 1769747 SHA256 37b3a22cea3ce8b87183f5d2d972d70db6e61825ea1c6bbc052e0120c49ee8c5 SHA512 8ff904e55d0c058f456df16b8bf07ca3ead266e817435f123b34cd2a334ef1fe46baaeb95e1cce3be3f5a52768b8352ea3e61151308e9002bfb40ef872659703 WHIRLPOOL b3804d3b5fcd632388aea19a3e9aa368748aa50b7abf482d293011bae3d4c78a3a3b2879b3bb6c0cb788721794d0c3146516f67364f6c89ed42cdb358c5d1807
+DIST deluge-1.3.14.tar.bz2 1774160 SHA256 c38ab40d71bf5c1b500958b2679fdfd3c45121860f1fade69b654ebd94e1ed09 SHA512 5bf37b647a84b31c4c5fa660a7a9b1f20eaac25dfe314dbc771d3ca40259e0f994ebfc6925e81902698b04291de1cae8efb0e246f1aca631bdbcdfda51b9ba42 WHIRLPOOL 76fc95acec3366f75f26e66207bb31a51f9ac55eb8882e106ca9086170973378bd796db55b2acdb70fa38467ff0f67c5822b7f0692218b4b603a2e77bf6b7ce7

diff --git a/net-p2p/deluge/deluge-1.3.14.ebuild b/net-p2p/deluge/deluge-1.3.14.ebuild
new file mode 100644
index 00000000000..ae26a6fa165
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.14.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS="~amd64 ~x86"
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+)
+
+CDEPEND=">=net-libs/rb_libtorrent-0.16.17[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	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 )
+	gtk? (
+		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[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# 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.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     52f1a0d32bdb19bd066c1bc705ca36189392b555
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 09:12:47 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 09:12:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f1a0d3

net-p2p/deluge: amd64 stable wrt bug #530720

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.13-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.13-r2.ebuild b/net-p2p/deluge/deluge-1.3.13-r2.ebuild
index 58714c7c2b9..33bb7e2d01c 100644
--- a/net-p2p/deluge/deluge-1.3.13-r2.ebuild
+++ b/net-p2p/deluge/deluge-1.3.13-r2.ebuild
@@ -16,10 +16,10 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     6e64dbcb7789e65ba12420a0369dc0de61640663
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  5 19:11:07 2017 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 19:11:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e64dbcb

net-p2p/deluge: Fix dependency on net-libs/rb_libtorrent.

The newer version of the library is not strictly necessary and requires
additional stabilization if to be used, so reducing the version requirement
for 1.3.13 in order to stabilize the point version.

Proxied-Maintainer: Paolo Pedroni
Gentoo-Bug: 601048

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-p2p/deluge/{deluge-1.3.13-r1.ebuild => deluge-1.3.13-r2.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.13-r1.ebuild b/net-p2p/deluge/deluge-1.3.13-r2.ebuild
similarity index 97%
rename from net-p2p/deluge/deluge-1.3.13-r1.ebuild
rename to net-p2p/deluge/deluge-1.3.13-r2.ebuild
index 2463ab6..54717c2 100644
--- a/net-p2p/deluge/deluge-1.3.13-r1.ebuild
+++ b/net-p2p/deluge/deluge-1.3.13-r2.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
 # $Id$
 
@@ -35,7 +35,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
-CDEPEND=">=net-libs/rb_libtorrent-1.0.9-r1[python,${PYTHON_USEDEP}]"
+CDEPEND=">=net-libs/rb_libtorrent-0.16.17[python,${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

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}] )

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     c0c490b40ca22da7024d320bf6248b09ed72db92
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 15:19:19 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:32:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c490b4

net-p2p/deluge: Clean up old testing versions

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-p2p/deluge/deluge-1.3.12-r4.ebuild | 141 ---------------------------------
 net-p2p/deluge/deluge-1.3.13.ebuild    | 140 --------------------------------
 2 files changed, 281 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r4.ebuild b/net-p2p/deluge/deluge-1.3.12-r4.ebuild
deleted file mode 100644
index d5a9bef..00000000
--- a/net-p2p/deluge/deluge-1.3.12-r4.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-)
-
-CDEPEND=">=net-libs/rb_libtorrent-0.14.9[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	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}]
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

diff --git a/net-p2p/deluge/deluge-1.3.13.ebuild b/net-p2p/deluge/deluge-1.3.13.ebuild
deleted file mode 100644
index 63882f6..00000000
--- a/net-p2p/deluge/deluge-1.3.13.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
-inherit distutils-r1 eutils systemd user l10n
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console geoip gtk libnotify sound webinterface"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	sound? ( gtk )
-	libnotify? ( gtk )
-"
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-)
-
-CDEPEND=">=net-libs/rb_libtorrent-1.0.9-r1[python,${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-util/intltool"
-RDEPEND="${CDEPEND}
-	dev-python/chardet[${PYTHON_USEDEP}]
-	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}]
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		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[${PYTHON_USEDEP}] )
-	)
-	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	local args=(
-		-e "/Compiling po file/a \\\tuptoDate = False"
-	)
-	sed -i "${args[@]}" -- 'setup.py' || die
-	args=(
-		-e 's|"new_release_check": True|"new_release_check": False|'
-		-e 's|"check_new_releases": True|"check_new_releases": False|'
-		-e 's|"show_new_releases": True|"show_new_releases": False|'
-	)
-	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
-
-	local loc_dir="${S}/deluge/i18n"
-	l10n_find_plocales_changes "${loc_dir}" "" ".po"
-	rm_loc() {
-		rm -vf "${loc_dir}/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if ! use console ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
-		rm -f "${D}/usr/bin/deluge-console" || die
-		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
-	fi
-	if ! use gtk ; then
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
-		rm -rf "${D}/usr/share/icons/" || die
-		rm -f "${D}/usr/bin/deluge-gtk" || die
-		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
-		rm -f "${D}/usr/share/applications/deluge.desktop" || die
-	fi
-	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
-	else
-		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
-		rm -f "${D}/usr/bin/deluge-web" || die
-		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
-	fi
-	newinitd "${FILESDIR}"/deluged.init-2 deluged
-	newconfd "${FILESDIR}"/deluged.conf-2 deluged
-	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If, after upgrading, deluge doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     b0deb71d2bcb777d38f30141cc3a9d9b1e6ba092
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 21:11:04 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 21:11:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0deb71d

net-p2p/deluge: Version bump 1.3.13

Proxy-commit
Gentoo-Bug: 589376

Package-Manager: portage-2.3.0

 net-p2p/deluge/Manifest | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 80be64c..351d6c9 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1 +1,2 @@
 DIST deluge-1.3.12.tar.bz2 1772567 SHA256 565745b2a3f0567fc007dbdfeea2aa96a6bebd7dbdda2ec932a3017c66613c93 SHA512 bcb909f70d407ec766a609a1525f48b0f0ce18217049ff05dfd03b3681bdc021a446afa265b288181c644b1e47c710f41d17b1244c3b991818b947a51b97eb74 WHIRLPOOL 683e6d197ee617646ffc716738c58f479df5dc05cfc20d8295c283f9b98da309490ec582becf0d584c28a957d8bcbf1dc7b9ab4b06879d1fd338bc88a0bda29b
+DIST deluge-1.3.13.tar.bz2 1769747 SHA256 37b3a22cea3ce8b87183f5d2d972d70db6e61825ea1c6bbc052e0120c49ee8c5 SHA512 8ff904e55d0c058f456df16b8bf07ca3ead266e817435f123b34cd2a334ef1fe46baaeb95e1cce3be3f5a52768b8352ea3e61151308e9002bfb40ef872659703 WHIRLPOOL b3804d3b5fcd632388aea19a3e9aa368748aa50b7abf482d293011bae3d4c78a3a3b2879b3bb6c0cb788721794d0c3146516f67364f6c89ed42cdb358c5d1807

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     0d806cba74b07446fa956d2d6184ebc3188defbf
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Fri Jul 22 14:22:22 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 21:11:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d806cba

net-p2p/deluge: version bump to 1.3.13

 net-p2p/deluge/deluge-1.3.13.ebuild | 140 ++++++++++++++++++++++++++++++++++++
 1 file changed, 140 insertions(+)

diff --git a/net-p2p/deluge/deluge-1.3.13.ebuild b/net-p2p/deluge/deluge-1.3.13.ebuild
new file mode 100644
index 0000000..63882f6
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.13.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
+)
+
+CDEPEND=">=net-libs/rb_libtorrent-1.0.9-r1[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-util/intltool"
+RDEPEND="${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	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}]
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		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[${PYTHON_USEDEP}] )
+	)
+	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	distutils-r1_python_prepare_all
+}
+
+esetup.py() {
+	# 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.
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
+	newinitd "${FILESDIR}"/deluged.init-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If, after upgrading, deluge doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     fc5e2cd290b1b9438248695b401837ce89a56cec
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Mon Jun 20 10:09:09 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:44:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc5e2cd2

net-p2p/deluge: Add stable live ebuild

Also fixes some tabs vs spaces issues

 net-p2p/deluge/deluge-1.3.12-r4.ebuild                            | 4 ++--
 .../deluge/{deluge-1.3.12-r4.ebuild => deluge-1.3.9999.ebuild}    | 8 ++++----
 net-p2p/deluge/deluge-9999.ebuild                                 | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r4.ebuild b/net-p2p/deluge/deluge-1.3.12-r4.ebuild
index 812e7f2..d5a9bef 100644
--- a/net-p2p/deluge/deluge-1.3.12-r4.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12-r4.ebuild
@@ -84,8 +84,8 @@ esetup.py() {
 	# Override this call from the distutils-r1 eclass.
 	# This does not respect the distutils-r1 API. DONOT copy this example.
 	set -- "${PYTHON}" setup.py "$@"
-    echo "$@"
-    "$@" || die
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {

diff --git a/net-p2p/deluge/deluge-1.3.12-r4.ebuild b/net-p2p/deluge/deluge-1.3.9999.ebuild
similarity index 97%
copy from net-p2p/deluge/deluge-1.3.12-r4.ebuild
copy to net-p2p/deluge/deluge-1.3.9999.ebuild
index 812e7f2..0090456 100644
--- a/net-p2p/deluge/deluge-1.3.12-r4.ebuild
+++ b/net-p2p/deluge/deluge-1.3.9999.ebuild
@@ -12,10 +12,11 @@ inherit distutils-r1 eutils systemd user l10n
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/"
 
-if [[ ${PV} == 9999 ]]; then
+if [[ ${PV} == 1.3.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
@@ -32,7 +33,6 @@ REQUIRED_USE="
 	libnotify? ( gtk )
 "
 PATCHES=(
-	"${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
 	"${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
 )
 
@@ -84,8 +84,8 @@ esetup.py() {
 	# Override this call from the distutils-r1 eclass.
 	# This does not respect the distutils-r1 API. DONOT copy this example.
 	set -- "${PYTHON}" setup.py "$@"
-    echo "$@"
-    "$@" || die
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index a8a9ca6..33cd876 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -83,8 +83,8 @@ esetup.py() {
 	# Override this call from the distutils-r1 eclass.
 	# This does not respect the distutils-r1 API. DONOT copy this example.
 	set -- "${PYTHON}" setup.py "$@"
-    echo "$@"
-    "$@" || die
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     0815f1fef33941a54fbbe7783e132106fef1be79
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Mon Jun 20 10:06:15 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:37:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0815f1fe

net-p2p/deluge: Remove old

 net-p2p/deluge/deluge-1.3.12-r3.ebuild | 100 ---------------------------------
 1 file changed, 100 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r3.ebuild b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
deleted file mode 100644
index 92b0c53..0000000
--- a/net-p2p/deluge/deluge-1.3.12-r3.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 eutils systemd user
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-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[${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[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	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
-		"${FILESDIR}"/${PN}-1.3.12-fix_scheduler_plugin.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-esetup.py() {
-	# 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.
-	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	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_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_newunit "${FILESDIR}"/deluge-web.service-2 deluge-web.service
-	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-	systemd_install_serviced "${FILESDIR}"/deluge-web.service.conf
-}
-
-pkg_postinst() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-	elog
-	elog "If after upgrading it doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "Systemd unit files for deluged and deluge-web no longer source"
-	elog "/etc/conf.d/deluge* files. Environment variable customization now"
-	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
-	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     6aa508aaa9cd595637c21335517e9359b98bead3
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Mon Jun 20 10:08:08 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 19:37:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa508aa

net-p2p/deluge: Sync live ebuild to latest changes

 net-p2p/deluge/deluge-9999.ebuild | 82 +++++++++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 21 deletions(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index e11f9c0..a8a9ca6 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -2,17 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 eutils systemd user
+PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW"
+inherit distutils-r1 eutils systemd user l10n
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/"
 
 if [[ ${PV} == 9999 ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
 		http://git.deluge-torrent.org/${PN}"
 	SRC_URI=""
@@ -24,18 +25,27 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="geoip gtk libnotify setproctitle sound webinterface"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+IUSE="console geoip gtk libnotify sound webinterface"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	sound? ( gtk )
+	libnotify? ( gtk )
+"
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.12-fix_scheduler_plugin.patch"
+)
 
-DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+CDEPEND=">=net-libs/rb_libtorrent-0.14.9[python,${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-util/intltool"
-RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
+RDEPEND="${CDEPEND}
 	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}]
+	dev-python/setproctitle[${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}] )
@@ -44,14 +54,26 @@ RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
 		gnome-base/librsvg
 		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
 	)
-	setproctitle? ( dev-python/setproctitle[${PYTHON_USEDEP}] )
 	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
-#Not needed anymore: bug #518354
-#	local PATCHES=(
-#		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
-#	)
+	local args=(
+		-e "/Compiling po file/a \\\tuptoDate = False"
+	)
+	sed -i "${args[@]}" -- 'setup.py' || die
+	args=(
+		-e 's|"new_release_check": True|"new_release_check": False|'
+		-e 's|"check_new_releases": True|"check_new_releases": False|'
+		-e 's|"show_new_releases": True|"show_new_releases": False|'
+	)
+	sed -i "${args[@]}" -- 'deluge/core/preferencesmanager.py' || die
+
+	local loc_dir="${S}/deluge/i18n"
+	l10n_find_plocales_changes "${loc_dir}" "" ".po"
+	rm_loc() {
+		rm -vf "${loc_dir}/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
 
 	distutils-r1_python_prepare_all
 }
@@ -61,27 +83,45 @@ esetup.py() {
 	# Override this call from the distutils-r1 eclass.
 	# This does not respect the distutils-r1 API. DONOT copy this example.
 	set -- "${PYTHON}" setup.py "$@"
-	echo "$@"
-	"$@" || die
+    echo "$@"
+    "$@" || die
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
+	if ! use console ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/console/" || die
+		rm -f "${D}/usr/bin/deluge-console" || die
+		rm -f "${D}/usr/share/man/man1/deluge-console.1" ||die
+	fi
+	if ! use gtk ; then
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/gtkui/" || die
+		rm -rf "${D}/usr/share/icons/" || die
+		rm -f "${D}/usr/bin/deluge-gtk" || die
+		rm -f "${D}/usr/share/man/man1/deluge-gtk.1" || die
+		rm -f "${D}/usr/share/applications/deluge.desktop" || die
+	fi
+	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_install_serviced "${FILESDIR}/deluge-web.service.conf"
+	else
+		rm -rf "${D}/usr/$(get_libdir)/python2.7/site-packages/deluge/ui/web/" || die
+		rm -f "${D}/usr/bin/deluge-web" || die
+		rm -f "${D}/usr/share/man/man1/deluge-web.1" || die
+	fi
 	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_newunit "${FILESDIR}"/deluged.service-2 deluged.service
-	systemd_newunit "${FILESDIR}"/deluge-web.service-2 deluge-web.service
 	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
-	systemd_install_serviced "${FILESDIR}"/deluge-web.service.conf
 }
 
 pkg_postinst() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 	elog
-	elog "If after upgrading it doesn't work, please remove the"
+	elog "If, after upgrading, deluge doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"
 	elog "first!"
 	elog

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Mike Gilbert]

commit:     ddefbab8715efe37c4ac708e1f6a25cf7649e460
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  9 17:30:19 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jun  9 17:30:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddefbab8

net-p2p/deluge: Override esetup.py

Resolves a build failure triggered by a change in distutils-r1.eclass.

Bug: https://bugs.gentoo.org/585454

Package-Manager: portage-2.3.0_rc1_p20

 net-p2p/deluge/deluge-1.3.12-r3.ebuild | 6 ++++--
 net-p2p/deluge/deluge-1.3.12.ebuild    | 8 +++++---
 net-p2p/deluge/deluge-9999.ebuild      | 6 ++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r3.ebuild b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
index 1327cd2..92b0c53 100644
--- a/net-p2p/deluge/deluge-1.3.12-r3.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
@@ -56,11 +56,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-_distutils-r1_create_setup_cfg() {
+esetup.py() {
 	# 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.
-	:
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {

diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
index c0fec62..221f13c 100644
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.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$
 
@@ -55,11 +55,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-_distutils-r1_create_setup_cfg() {
+esetup.py() {
 	# 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.
-	:
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 579b78e..e11f9c0 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -56,11 +56,13 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-_distutils-r1_create_setup_cfg() {
+esetup.py() {
 	# 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.
-	:
+	set -- "${PYTHON}" setup.py "$@"
+	echo "$@"
+	"$@" || die
 }
 
 python_install_all() {

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Patrice Clement]

commit:     ba5a4f913f103e6fd27e49d2f7080258b6b18dbc
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Mar  9 10:36:49 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 10:18:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba5a4f91

net-p2p/deluge: improved systemd support

The ebuild now creates deluge user and group (fix Gentoo bug #566806)
Give notice to systemd users of change in configuration files.

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.12-r3.ebuild | 97 ++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/net-p2p/deluge/deluge-1.3.12-r3.ebuild b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
new file mode 100644
index 0000000..cd671e1
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.12-r3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 eutils systemd user
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+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[${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[${PYTHON_USEDEP}] )
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	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
+	)
+
+	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-2 deluged
+	newconfd "${FILESDIR}"/deluged.conf-2 deluged
+	newinitd "${FILESDIR}"/deluge-web.init deluge-web
+	newconfd "${FILESDIR}"/deluge-web.conf deluge-web
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_newunit "${FILESDIR}"/deluge-web.service-2 deluge-web.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+	systemd_install_serviced "${FILESDIR}"/deluge-web.service.conf
+}
+
+pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	elog
+	elog "If after upgrading it doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Patrice Clement]

commit:     2360546f8c45012d6e5b4754d8d3b73c283b469a
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Mar  9 10:39:51 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 10:18:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2360546f

net-p2p/deluge: sync live ebuild

This series of commits closes #1010.

Pull-Request: https://github.com/gentoo/gentoo/pull/1010
Gentoo-Bug: https://bugs.gentoo.org/566806
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/deluge/deluge-9999.ebuild | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 41f5ba8..579b78e 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 eutils systemd
+inherit distutils-r1 eutils systemd user
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="http://deluge-torrent.org/"
@@ -48,7 +48,7 @@ RDEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
 	webinterface? ( dev-python/mako[${PYTHON_USEDEP}] )"
 
 python_prepare_all() {
-# Not needed anymore: bug #518354
+#Not needed anymore: bug #518354
 #	local PATCHES=(
 #		"${FILESDIR}"/${PN}-1.3.5-disable_libtorrent_internal_copy.patch
 #	)
@@ -69,11 +69,15 @@ python_install_all() {
 	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
+	systemd_newunit "${FILESDIR}"/deluged.service-2 deluged.service
+	systemd_newunit "${FILESDIR}"/deluge-web.service-2 deluge-web.service
+	systemd_install_serviced "${FILESDIR}"/deluged.service.conf
+	systemd_install_serviced "${FILESDIR}"/deluge-web.service.conf
 }
 
 pkg_postinst() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
 	elog
 	elog "If after upgrading it doesn't work, please remove the"
 	elog "'~/.config/deluge' directory and try again, but make a backup"
@@ -84,6 +88,11 @@ pkg_postinst() {
 	elog "/etc/init.d/deluged start as root"
 	elog "You can still use deluge the old way"
 	elog
+	elog "Systemd unit files for deluged and deluge-web no longer source"
+	elog "/etc/conf.d/deluge* files. Environment variable customization now"
+	elog "happens in /etc/systemd/system/deluged.service.d/00gentoo.conf"
+	elog "and /etc/systemd/system/deluge-web.service.d/00gentoo.conf"
+	elog
 	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Patrice Clement]

commit:     1f50efe4d66b1072fba15a03803631f55deec88e
Author:     PPed72 <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Mar  9 10:39:27 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 10:18:13 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f50efe4

net-p2p/deluge: remove old

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.12-r2.ebuild | 88 ----------------------------------
 1 file changed, 88 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r2.ebuild b/net-p2p/deluge/deluge-1.3.12-r2.ebuild
deleted file mode 100644
index 4635020..0000000
--- a/net-p2p/deluge/deluge-1.3.12-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 eutils systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
-		http://git.deluge-torrent.org/${PN}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-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[${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[${PYTHON_USEDEP}] )
-		dev-python/pygobject:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-	)
-	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
-	)
-
-	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-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
-}
-
-pkg_postinst() {
-	elog
-	elog "If after upgrading it doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Ian Delaney]

commit:     65e9fb3ed91782ad6e03a001da4ba0a94371f474
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Mon Feb 29 14:38:01 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> 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
 }

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     024f0ac75e177f293a00aa10e3543ce09a662c13
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Tue Feb 23 16:11:26 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 20:38:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=024f0ac7

net-p2p/deluge: split startup script for daemon and web insterface

Rename ebuild to force upgrade for ~arch users. Fixes bug #350213.
Thanks to Cameron Tacklind <cameron <AT> tacklind.com> for bug report
and inspiration.

 net-p2p/deluge/{deluge-1.3.12-r1.ebuild => deluge-1.3.12-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r1.ebuild b/net-p2p/deluge/deluge-1.3.12-r2.ebuild
similarity index 100%
rename from net-p2p/deluge/deluge-1.3.12-r1.ebuild
rename to net-p2p/deluge/deluge-1.3.12-r2.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     78684501329d9fe5885cb3c16bba5231331be963
Author:     Paolo Pedroni <paolo.pedroni <AT> iol <DOT> it>
AuthorDate: Wed Feb 17 10:46:40 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 20:38:29 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78684501

net-p2p/deluge: unbundle startup scripts for daemon and web interface

Fixes bug #350213 (thanks to Cameron Tacklind <cameron <AT> tacklind.com>)

 net-p2p/deluge/deluge-1.3.12-r1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.12-r1.ebuild b/net-p2p/deluge/deluge-1.3.12-r1.ebuild
index 2f162e2..4635020 100644
--- a/net-p2p/deluge/deluge-1.3.12-r1.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12-r1.ebuild
@@ -64,8 +64,10 @@ _distutils-r1_create_setup_cfg() {
 
 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
 }

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     42570c95203b6b53bb5a3f793f5b82188dd932fd
Author:     Paolo Pedroni <PPed72 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Feb 16 13:16:17 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 17:51:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42570c95

net-p2p/deluge: fix manifest

Fix qa warning

 net-p2p/deluge/Manifest | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index cba4afd..80be64c 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1 @@
 DIST deluge-1.3.12.tar.bz2 1772567 SHA256 565745b2a3f0567fc007dbdfeea2aa96a6bebd7dbdda2ec932a3017c66613c93 SHA512 bcb909f70d407ec766a609a1525f48b0f0ce18217049ff05dfd03b3681bdc021a446afa265b288181c644b1e47c710f41d17b1244c3b991818b947a51b97eb74 WHIRLPOOL 683e6d197ee617646ffc716738c58f479df5dc05cfc20d8295c283f9b98da309490ec582becf0d584c28a957d8bcbf1dc7b9ab4b06879d1fd338bc88a0bda29b
-DIST deluge-1.3.6.tar.bz2 1725202 SHA256 756a025d88752f39133aa34d8fc96d4ce216113919488d60098ee41f860a1f60 SHA512 22a8308c139e95190b3832ee9547e7c84a56cf1cc6f18ecebaf7af7997d73efe41664fd875e7e1753eb0b1e616f12e5e54f5fb2790261753b85f5512b8882e12 WHIRLPOOL f43a5ae5a94fc49cb76ee3561b18b9aeaff759c72a77d629170f4294e63c90f883e346eb0a5c75c0d13683fdf1848b07af2bfcd6432253cd40642735e50d10e1

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     e82347db494753ffe0c03b657db96150ba612fbb
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 18:26:59 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 18:26:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82347db

net-p2p/deluge: New revision

Package-Manager: portage-2.2.27

 net-p2p/deluge/deluge-1.3.12-r1.ebuild | 86 ++++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/net-p2p/deluge/deluge-1.3.12-r1.ebuild b/net-p2p/deluge/deluge-1.3.12-r1.ebuild
new file mode 100644
index 0000000..2f162e2
--- /dev/null
+++ b/net-p2p/deluge/deluge-1.3.12-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+inherit distutils-r1 eutils systemd
+
+DESCRIPTION="BitTorrent client with a client/server model"
+HOMEPAGE="http://deluge-torrent.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git
+		http://git.deluge-torrent.org/${PN}"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+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[${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[${PYTHON_USEDEP}] )
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+		gnome-base/librsvg
+		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	)
+	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
+	)
+
+	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
+	systemd_dounit "${FILESDIR}"/deluged.service
+	systemd_dounit "${FILESDIR}"/deluge-web.service
+}
+
+pkg_postinst() {
+	elog
+	elog "If after upgrading it doesn't work, please remove the"
+	elog "'~/.config/deluge' directory and try again, but make a backup"
+	elog "first!"
+	elog
+	elog "To start the daemon either run 'deluged' as user"
+	elog "or modify /etc/conf.d/deluged and run"
+	elog "/etc/init.d/deluged start as root"
+	elog "You can still use deluge the old way"
+	elog
+	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
+	elog
+}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     c3e511cbfbddb5f34da1e76a28a4b3da39627602
Author:     Paolo Pedroni <PPed72 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Feb 11 13:41:04 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 17:50:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e511cb

net-p2p/deluge: remove old

 net-p2p/deluge/deluge-1.3.6.ebuild | 74 --------------------------------------
 1 file changed, 74 deletions(-)

diff --git a/net-p2p/deluge/deluge-1.3.6.ebuild b/net-p2p/deluge/deluge-1.3.6.ebuild
deleted file mode 100644
index dd87373..0000000
--- a/net-p2p/deluge/deluge-1.3.6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit distutils eutils python systemd
-
-DESCRIPTION="BitTorrent client with a client/server model"
-HOMEPAGE="http://deluge-torrent.org/"
-SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
-IUSE="geoip gtk libnotify setproctitle sound webinterface"
-
-DEPEND=">=net-libs/rb_libtorrent-0.14.9[python]
-	dev-python/setuptools
-	dev-util/intltool"
-RDEPEND="${DEPEND}
-	dev-python/chardet
-	dev-python/pyopenssl
-	dev-python/pyxdg
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
-	>=dev-python/twisted-core-8.1
-	>=dev-python/twisted-web-8.1
-	geoip? ( dev-libs/geoip )
-	gtk? (
-		sound? ( dev-python/pygame )
-		dev-python/pygobject:2
-		>=dev-python/pygtk-2.12
-		gnome-base/librsvg
-		libnotify? ( dev-python/notify-python )
-	)
-	setproctitle? ( dev-python/setproctitle )
-	webinterface? ( dev-python/mako )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	distutils_src_prepare
-	python_convert_shebangs -r 2 .
-	epatch "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch"
-
-}
-
-src_install() {
-	distutils_src_install
-	newinitd "${FILESDIR}"/deluged.init deluged
-	newconfd "${FILESDIR}"/deluged.conf deluged
-	systemd_dounit "${FILESDIR}"/deluged.service
-	systemd_dounit "${FILESDIR}"/deluge-web.service
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	elog
-	elog "If after upgrading it doesn't work, please remove the"
-	elog "'~/.config/deluge' directory and try again, but make a backup"
-	elog "first!"
-	elog
-	elog "To start the daemon either run 'deluged' as user"
-	elog "or modify /etc/conf.d/deluged and run"
-	elog "/etc/init.d/deluged start as root"
-	elog "You can still use deluge the old way"
-	elog
-	elog "For more information look at http://dev.deluge-torrent.org/wiki/Faq"
-	elog
-}

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     f0afac3bd6bba77cf487a3f1f5f072734ca45c1f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 10:09:19 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 10:10:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0afac3b

net-p2p/deluge: x86 stable wrt bug #566206

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
index 4a1199b..c0fec62 100644
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Kristian Fiskerstrand]

commit:     f9210bd6448d13cdf303f0ea6bb882147e460ea5
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 19:05:00 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 19:05:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9210bd6

net-p2p/deluge: Assign maintainership to proxied maintainer

Package-Manager: portage-2.2.27

 net-p2p/deluge/metadata.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 5503193c..ed12ae6 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>paolo.pedroni@iol.it</email>
+		<name>Paolo Pedroni</name>
+		<description>Proxied Maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+		<description>Proxy Maintainer, CC on bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 <use>
 	<flag name="setproctitle">Install dependencies needed for beautifying
 		the process name</flag>

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Pacho Ramos]

commit:     1150f5154b76841d4d4b52e14b92ae508a376147
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 17:51:43 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 17:51:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1150f515

net-p2p/deluge: PYTHON_REQUIRED_USE needed

Package-Manager: portage-2.2.27

 net-p2p/deluge/deluge-1.3.12.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
index 6aa9bf1..4a1199b 100644
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.ebuild
@@ -25,6 +25,7 @@ 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}]

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Agostino Sarubbo]

commit:     06a453021a1d1e615930a16f237e0ba9c84ba671
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 09:01:38 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 09:01:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a45302

net-p2p/deluge: amd64 stable wrt bug #566206

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-p2p/deluge/deluge-1.3.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/deluge-1.3.12.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
index 35a8ed9..6aa9bf1 100644
--- a/net-p2p/deluge/deluge-1.3.12.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Robin H. Johnson]

commit:     fcb1cfc7ac6c9765e53ae552d7181520fc5fe4bc
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 23 18:16:30 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 18:17:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcb1cfc7

Fix manifest.

Package-Manager: portage-2.2.24

 net-p2p/deluge/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 2fb82ca..cba4afd 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,2 +1,2 @@
-DIST deluge-1.3.11.tar.bz2 1792459 SHA256 83e1f41b8a2a6e7ba86a54474692d4686db509b75441173d9603447f9e0ec898 SHA512 d56c03f3c687cdee65f8d7f26728a46cae1fd665c49313bd2b91243d26df0f5b2292048fd542333cbc538383eb53cd961bc3427230f9081317268735df367272 WHIRLPOOL 52820837a24ef3d4917a1b018fa30c8ec662a6c2366cb848fb984b716175bad63131e7cc4eea7688405e380102cf0ebb5ae4b58dcd7c90fd7dde9dcc9dada444
+DIST deluge-1.3.12.tar.bz2 1772567 SHA256 565745b2a3f0567fc007dbdfeea2aa96a6bebd7dbdda2ec932a3017c66613c93 SHA512 bcb909f70d407ec766a609a1525f48b0f0ce18217049ff05dfd03b3681bdc021a446afa265b288181c644b1e47c710f41d17b1244c3b991818b947a51b97eb74 WHIRLPOOL 683e6d197ee617646ffc716738c58f479df5dc05cfc20d8295c283f9b98da309490ec582becf0d584c28a957d8bcbf1dc7b9ab4b06879d1fd338bc88a0bda29b
 DIST deluge-1.3.6.tar.bz2 1725202 SHA256 756a025d88752f39133aa34d8fc96d4ce216113919488d60098ee41f860a1f60 SHA512 22a8308c139e95190b3832ee9547e7c84a56cf1cc6f18ecebaf7af7997d73efe41664fd875e7e1753eb0b1e616f12e5e54f5fb2790261753b85f5512b8882e12 WHIRLPOOL f43a5ae5a94fc49cb76ee3561b18b9aeaff759c72a77d629170f4294e63c90f883e346eb0a5c75c0d13683fdf1848b07af2bfcd6432253cd40642735e50d10e1

[gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/

[Patrice Clement]

commit:     19c9530e8cf386649a0815cd532d24f6e7261867
Author:     Paolo Pedroni <PPed72 <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Tue Nov 17 10:31:30 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Nov 23 13:17:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19c9530e

net-p2p/deluge: Version bump. Fixes bug 561398.

Gentoo-Bug: 561398

 net-p2p/deluge/{deluge-1.3.11.ebuild => deluge-1.3.12.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-p2p/deluge/deluge-1.3.11.ebuild b/net-p2p/deluge/deluge-1.3.12.ebuild
similarity index 98%
rename from net-p2p/deluge/deluge-1.3.11.ebuild
rename to net-p2p/deluge/deluge-1.3.12.ebuild
index d42c92d..35a8ed9 100644
--- a/net-p2p/deluge/deluge-1.3.11.ebuild
+++ b/net-p2p/deluge/deluge-1.3.12.ebuild
@@ -27,6 +27,7 @@ SLOT="0"
 IUSE="geoip gtk libnotify setproctitle sound webinterface"
 
 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[${PYTHON_USEDEP}]