gentoo resync : 25.04.2020

5 files changed, 159 insertions, 5 deletions

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 0ad01cec602b..9309015a7c28 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,6 +1,7 @@
 AUX deluge-1.3.15-r1-fix-preferences-ui.patch 1209 BLAKE2B 570dba58991221c2c2d329c0a367f68ebadf15d7b0fef8633c9c22d1c3dc992328d69f329f9700d2c46ab812ff4d99de420a37daecbb6623338e005f8fa9538d SHA512 9d32dad457ce5fe5752fa3f4dd42492443ffbeb0508347d21197b4ee950674dbf209d4faf6a730c37eecfa8a5233606fbef9ede5c4a2da5ee60d047ec7569b98
 AUX deluge-1.3.5-disable_libtorrent_internal_copy.patch 1165 BLAKE2B 68d0e98ca8648adb3f5afdeda84c4d36fa5bcea2239e37087404573faa4b8084a8c54362d237bbfda702d4b12213818259ddc0cd61013dc7261186899ded4b96 SHA512 8f08d5b9cfcff3fda8153d4bdfc8435a3b63fefc51b6cd3c648a82134377dc561e68df3c9aba4a37cffeff7b789d352a438b75ec6bdaf58f87ab5326f641b316
 AUX deluge-2.0.3-UI-status.patch 1406 BLAKE2B 7da865fa6d87fbfc0443572d34cbf7324cc76037c603b7d2199081533fab04362d78e15dcaf37ceeb606f04017e8b1b5ad9ceb2028a9bd4d11bb859f02d3d898 SHA512 4860c7147ff4ec6da072a4245be7a80e6512f6cf2eecfd4db8260a206e76d1cb44b9f063e82e5a57ef70ab3d7dd020d9ba5ddb1c96b2bbb72ed9d3b2f20d85c8
+AUX deluge-2.0.3-gettext.patch 483 BLAKE2B 5c0c4462a27c9e8339979593c7868cca6a3f56549cba094d7f3932b76fe65c5f6d50390db7bbfc39268de05ebaa92bf1a22caffe6ae858e6adf222f17cec15d4 SHA512 122127744960786d7c3b247feb69fa4397ceb70bb1a4f2d30be4a683f163096f120cc5a0f72602cab39374eae5351bd5b3cf8bfd527bf036cc8e5e7f0700cf32
 AUX deluge-2.0.3-setup.py.patch 428 BLAKE2B f9469cac78d66cf71b510d846bceb1e59e6c887d89b239d39f67aa3757434dd2f3e384531733ceb332b8b57d62b56f34244caa592a279aa812269cde6106b1cc SHA512 d2f23dd8a27aa5537610c34b6197962b986f4811a89dffbfc82fade0dc8c0942a8f58480e0235d11d049f89dd38c48da43bbf1dc8a66f26cbc16db764b672af5
 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
 AUX deluge-web.init 1484 BLAKE2B f58b9a929345ee705088cc7efbf83bd1537a8e0c8332e3c4d50f08f47b1a41c5b5005cb19c94e555fcbe92bcc1c5f2e274057cd9624789ee107d22717ffa0d03 SHA512 8afb1318e4cf267013a3704f71c83942c4c862eeb6d91ea15f4a2a8bb5f1bed7461453bf2877fe0afc4c3f560dad3629ade538324a75a9b6ce4982f5121a74ef
@@ -19,6 +20,7 @@ EBUILD deluge-1.3.15-r6.ebuild 4493 BLAKE2B e097dcbba9eb411cb71421ac8d45ba6f9d63
 EBUILD deluge-1.3.15-r7.ebuild 4431 BLAKE2B f6e97528f9c78fbc5a1fb1827284410dfbb02cf9a45c66f98d58ddea69bfa26b28d8791f7d25280f030fe3216f96b75406e603c2fe9d30fe20140c03dc497937 SHA512 5bc29d225085c4a4fe2aaf7edcf1ef6827e72787914661b37389be18af2e0316ba015c7e74111090ee699c29e792e50695b70782f30beab8d8c2336ec4e49a47
 EBUILD deluge-1.3.9999.ebuild 4441 BLAKE2B eaeca4ed31cc750ec9de42b6ad53777832717e6224639de6b2ffa0c59b7abb22a3264f08fbc10db9f79cc289cee6ba03f0fdb284d94d3760866b7cf584b53fa3 SHA512 24e5c4641c573a822dd2ef002d851cf0d935b28f3c65b75215e4e824b975ffb32e1f9a5d094580f006a74155277ab3b2af384917cfb1c92dfa9737bb8c9e7e46
 EBUILD deluge-2.0.3-r4.ebuild 4551 BLAKE2B ca627923fdbb7144d4e4891916e5ef9f6e85f9ccdb24adc7ce28ab9295148ef3ec56c4f9fe3a53a6cc3c3b172dabb8c3ea23f7989db9e0d0d2c212313d8bbef8 SHA512 5b44412ab8537de7399608ff20afb7c8b06dc7ccc450dba4536df1c20c707bf59d3fa42bac27e91176e0d751da2a1848705fdcd0b7752df8fb3d13e676be4c37
-EBUILD deluge-2.0.3-r5.ebuild 4485 BLAKE2B 594dd62684161f8e3ac1cabe8e936290229d767ce6cde23a86b733b8cec0ccf83585cf1e2818126afd2d67a4a3e994a76e53a641359e10e948df2426772369d0 SHA512 d9dee2ef9d05b0e7a7973b1da3500c57095746d6c6750b9836fcaf571fe16cb1f28a3e22c8734d917678c2e5b5e324886db52069aa41c846179ebab89b1382f8
-EBUILD deluge-9999.ebuild 4481 BLAKE2B 157aeb683c381e0e421ffb15029c64c73dd1281dc2c2708128108fd0df088e9e727b444ab648340e04292232ccc011f614104fb753b63151d4c01b60b33982d1 SHA512 807d72757aa4343cf99de89ff6f4b404219951fd0872295d95ae5482510821b1425b2136d2418caecd1d4e80d25e135aee5a27d05c8e773953e271df203df9f9
+EBUILD deluge-2.0.3-r5.ebuild 4494 BLAKE2B c044f5d698919c6930999a0ccda4f475c470a4ed07b7fbfa2e4eed7b744b1853317724857048ca0a26556afa75e7a711c97eca8a84ba37c66ad3b50c96e9ffb7 SHA512 853df5c79bb8cd07b9a9afa5ad4ae262f893f00f9e3b3e4feb5e473d7fa176f5d651e3b23aed9304e95ae3990a1b10770a4788f581ba6f2a0b883f57a4ac05e0
+EBUILD deluge-2.0.3-r6.ebuild 4536 BLAKE2B 2e364f8ab18cd863e062883a44347e25d1013423fab81731b8ed5ed12f16d46d7bf1dd3c334092ad8d2d4f6a8a827036a3432dca0a287c430e021b3d27d192c3 SHA512 907108811c97d88e8ccdee666623f8a130503e45ca4c148ce9266d802654075136940fbcc5563a6ce7de82bf602c6339e277d3e14fd66e3569895ec98dbfb97c
+EBUILD deluge-9999.ebuild 4483 BLAKE2B 68bc5d2fcb7a73aa084d5bb9f10a783503be261634a9162cbacfeb4454bbdca7c2aa858de5295e0cbfe934037eb97442721fee83b474b5076a6c920cecf34150 SHA512 00587ba71ee066314024586ec5420ed6419053f0ecde16a8745e021ea7dcc328d941927c011e14fd72b31a4ffc8c8eee72046c921f2612786794b6b2a968b35c
 MISC metadata.xml 756 BLAKE2B bc8720edfa5af1ee53bdf84af194bce3f3620d228d3cffa2b7af0b239b8d0988ff9df2f6cd24931496bb474867403164870f46170db0b1697ee80035c07760e3 SHA512 19ffe8fe672b0a3929cae6351e07c3422e445479a9627d968aefc2b8f7ff042460a6b4e76ea4aa131b3136e3237b700cd8039b1efdefaacc30a194707df86d81
diff --git a/net-p2p/deluge/deluge-2.0.3-r5.ebuild b/net-p2p/deluge/deluge-2.0.3-r5.ebuild
index f66dc0550184..1afeb0acefde 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
 
@@ -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"
diff --git a/net-p2p/deluge/deluge-2.0.3-r6.ebuild b/net-p2p/deluge/deluge-2.0.3-r6.ebuild
new file mode 100644
index 000000000000..dae306a6061b
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.0.3-r6.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 "${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-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 9bf5ba2d72ba..121cab580048 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
 
diff --git a/net-p2p/deluge/files/deluge-2.0.3-gettext.patch b/net-p2p/deluge/files/deluge-2.0.3-gettext.patch
new file mode 100644
index 000000000000..41cf743749c6
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.0.3-gettext.patch
@@ -0,0 +1,11 @@
+--- a/deluge/i18n/util.py
++++ b/deluge/i18n/util.py
+@@ -114,7 +114,7 @@
+         # Workaround for Python 2 unicode gettext (keyword removed in Py3).
+         kwargs = {} if not deluge.common.PY2 else {'unicode': True}
+ 
+-        gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs)
++        gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs)
+         builtins.__dict__['_n'] = builtins.__dict__['ngettext']
+ 
+         libintl = None