gentoo resync : 04.07.2020

4 files changed, 153 insertions, 10 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 0650f15eac19..a2237fe499ee 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index a0522da675aa..97104606ff52 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -14,5 +14,6 @@ DIST deluge-2.0.3.tar.xz 1777624 BLAKE2B d090e63e7e18c7b420e1c4239c833512a04a72e
 EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f9ccdb24adc7ce28ab9295148ef3ec56c4f9fe3a53a6cc3c3b172dabb8c3ea23f7989db9e0d0d2c212313d8bbef8 SHA512 5b44412ab8537de7399608ff20afb7c8b06dc7ccc450dba4536df1c20c707bf59d3fa42bac27e91176e0d751da2a1848705fdcd0b7752df8fb3d13e676be4c37
 EBUILD deluge-2.0.3-r5.ebuild 4498 BLAKE2B 36a76f2ac7e3729c02fbe55778a4e03f180bc9a786a2e588f9824a2da3f30a01bd414b114fcf00e41f4be7dc35190f204fba5558718894f5ebc7c49aaa0b7e99 SHA512 eb2175efa677e713c9f4f43f8eee4dffbd152b3b15e9344ee402d056504c62a87851bebdc6e5c9b899f58bf24ddf1dfaeed58a402d6bc5ec43558a8de9e57ad5
 EBUILD deluge-2.0.3-r6.ebuild 4536 BLAKE2B 2e364f8ab18cd863e062883a44347e25d1013423fab81731b8ed5ed12f16d46d7bf1dd3c334092ad8d2d4f6a8a827036a3432dca0a287c430e021b3d27d192c3 SHA512 907108811c97d88e8ccdee666623f8a130503e45ca4c148ce9266d802654075136940fbcc5563a6ce7de82bf602c6339e277d3e14fd66e3569895ec98dbfb97c
-EBUILD deluge-9999.ebuild 4483 BLAKE2B 68bc5d2fcb7a73aa084d5bb9f10a783503be261634a9162cbacfeb4454bbdca7c2aa858de5295e0cbfe934037eb97442721fee83b474b5076a6c920cecf34150 SHA512 00587ba71ee066314024586ec5420ed6419053f0ecde16a8745e021ea7dcc328d941927c011e14fd72b31a4ffc8c8eee72046c921f2612786794b6b2a968b35c
+EBUILD deluge-2.0.3-r7.ebuild 4544 BLAKE2B d04ab2b41c9f3080a6743768f844daa65673f19d105e616d8398f6015674c8570e28d996ce809ac2fb6028caeb590c55d36f64cd407ffb929d91b397798aaa43 SHA512 71bbcefe5ede6133321753afa10739936878e214b7df56881abe1db4348c0feb0eff07e01f376f2fba338ffe1f2f425bc72336764f9b5c2feaf071dcf8206ef9
+EBUILD deluge-9999.ebuild 4544 BLAKE2B d04ab2b41c9f3080a6743768f844daa65673f19d105e616d8398f6015674c8570e28d996ce809ac2fb6028caeb590c55d36f64cd407ffb929d91b397798aaa43 SHA512 71bbcefe5ede6133321753afa10739936878e214b7df56881abe1db4348c0feb0eff07e01f376f2fba338ffe1f2f425bc72336764f9b5c2feaf071dcf8206ef9
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-2.0.3-r7.ebuild b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
new file mode 100644
index 000000000000..2caebb8c9d1d
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r7.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,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
+}
diff --git a/net-p2p/deluge/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 121cab580048..2caebb8c9d1d 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