gentoo auto-resync : 07:11:2022 - 21:22:53

4 files changed, 204 insertions, 0 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 023104e0219a..f3934ca4a558 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 977918ab2397..b684a749f420 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,3 +1,4 @@
+AUX deluge-2.1.1-twisted-22.10.patch 1166 BLAKE2B 000c3e3bb63edcadb17c373d899557c32b3ffecfb2725bc283c630854f9643749e739fb58816c4222cf5d296388fa249ff1b8229c9dd00eb4e0f9190cc601bf6 SHA512 fd5ebff902679c7c2dc74638afe650c19199ff58cda8cf73a0c91333a3be5fa07732080856ba092ad25a9472d4269de45161b3d1b93fd8536dc9dd766ed69b67
 AUX deluge-web.conf 210 BLAKE2B 169ddb5ad6259940cf0539e884874b42b739c2425011a86208a608bbaece9db386dca186246671d5dc10b61677b843c0a2b6f7dbd6f8a99da2061a1f83867fa3 SHA512 ecea3cd59dff0c2f0215d98c9e4adda49b6f1f95d43d844262fe73c335d93a6e9076ff5143ff7f3e9f4433087d16a1d0497f75e2b1e0a3d788f5ad60705c9999
 AUX deluge-web.init-2 1500 BLAKE2B 2e4d551f9fb106f03b4c28414cf8e03369226fe9e6a3e2b1f6619ed409c96084072ad97f9681407abb00df54133456bc57420781748cb16a3de175d1e1beb0f1 SHA512 9f8d8d7a0ecc8d320cd484006d28d0aee2f7053c8cb68d9b08aad5f77a0c817ca15663a13e4d6535920bf18d8dae5bca61cc9cf790c9d1d2103b54aebe01fd27
 AUX deluge-web.service-3 200 BLAKE2B cddc255dda99d26d603c20d2d5e6ab15b46a81fd1865734e9b77df82580788938fd2f343c1f3bc5e57062c5089c3244b7e1950451912bdc460c2bba28dd6da89 SHA512 50791884fe84c39784b6350cc38dbca116ae5e4505a6cae6a3833167014861d51fdce7902ad1ca74bbe0b580438d850cc7a8f4f2d065f495c6e7864e360577fa
@@ -7,6 +8,7 @@ AUX deluged.init-2 1503 BLAKE2B 1a46adee922caa964d67e114f27b7d00bf5b8913cf8870aa
 AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7385d8c7350ea3a23aa16d4761c598ff2208a2eeb997c3ded11f79637aefb4268fdfc74e7eaedd5fb5f SHA512 cbb783b92eff1562435b690ec1ae9fd7e407577b33764b049d1a591260044ee66ba18acd3f3bf8ddf3822e082a2edb53db16de64c706cb190cf1026e2f880c8c
 AUX deluged.service.conf 114 BLAKE2B 4b04389b8337e692966f20c9423c5e86a2852969f95684e01fccadc84987cefdc198364dc3827673d33696d109d2194d3aed4f9f90260c373dd4d45b1fe1a05f SHA512 b84ffe94048757359753157643e3d5d6a8110aebffbaf73b836f6f3f53a4e6fee6bcdf65563233ac04859707a5eda986638374b28d913281a98c9edaa6e4750a
 DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455
+EBUILD deluge-2.1.1-r1.ebuild 5785 BLAKE2B 2930d8630dda9a4a942088dbd1c8c75c7e2cf91879f2cc8fc49d78ad9558f4acbf8381a155e75264151de2668e616957581b6a64f6257b1bb48d80112adfdb03 SHA512 3e1a00f1c744626d56da900822e483eecd205ee3258a112fbe342db1478ecf467d92a2f92d9fc7b99415b16219104c347dd92e01c81212f9d41912f1698b4d62
 EBUILD deluge-2.1.1.ebuild 5733 BLAKE2B 2489d7d9d94cb12cac664991e779c58ecd35a6b911dc0019b3d2963a1b48d7f7306bd7a850e5cb6aca072e598c496f5d93d7404c1ab278baeaec8f81addd12d0 SHA512 723f3380a2942df924bd43010dff8fc3672fd59e264c76eba0d56d9d509975ba48b0b5edccc54ad6f3d7cbc070a522f2175f811e8cb3e4502ab63f1d2b040fa3
 EBUILD deluge-9999.ebuild 5730 BLAKE2B 01949be06bdb0460438c418dfe428115b412b36516eede367510f531e9a5dd2eeaa8a39e8691fe28b082d4712c0ec32570826c6b3936f0e09eb9bf5c15663d2a SHA512 dc2e2c9bc09ea8c6e3c0fae62efd003e8c9604f36c0cf60a53ba651dcc73437173a860a0e6551fe1a21b3b812231f567cded16db16b18f12bd771ba02b6c783d
 MISC metadata.xml 763 BLAKE2B 8d0ee2a486c2755cda79b56d622c96803c2b2538bd8f3c4598381bfe3a03572c0503510eb7952c37b5432fa1a9d6db73badbd02b939961fb81567149d9fb8a5f SHA512 f6bbd8504c4edfc5b9420a1d7c52e56f3ebe5f8f92b5db3b5a954b9324e1a6cf7938a9e1d8d98305d3fed42422d584f31f0d17fdb884e05ed01480075600fc06
diff --git a/net-p2p/deluge/deluge-2.1.1-r1.ebuild b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..49f330c238b3
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.1.1-r1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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-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/files/deluge-2.1.1-twisted-22.10.patch b/net-p2p/deluge/files/deluge-2.1.1-twisted-22.10.patch
new file mode 100644
index 000000000000..689721e76266
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.1.1-twisted-22.10.patch
@@ -0,0 +1,31 @@
+From 29dd0fcf8a6b6256d111b2ceb67798ae73c3e0b1 Mon Sep 17 00:00:00 2001
+From: DjLegolas <djlegolas@protonmail.com>
+Date: Mon, 7 Nov 2022 01:05:55 +0200
+Subject: [PATCH] [WebUI] Fix `TypeError` in DelugeWeb constractor
+
+In `twisted 22.10`, a check new for passing the `path` variable as
+`bytes` in the `putChild` method.
+We were enforcing this on every other place but the `__init__` of
+`DelugeWeb` itself.
+
+Ref: https://github.com/twisted/twisted/pull/11718
+Closes: https://dev.deluge-torrent.org/ticket/3566
+---
+ deluge/ui/web/server.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py
+index f391a78d27..020cf9ef4f 100644
+--- a/deluge/ui/web/server.py
++++ b/deluge/ui/web/server.py
+@@ -682,7 +682,9 @@ def __init__(self, options=None, daemon=True):
+ 
+         if self.base != '/':
+             # Strip away slashes and serve on the base path as well as root path
+-            self.top_level.putChild(self.base.strip('/'), self.top_level)
++            self.top_level.putChild(
++                self.base.strip('/').encode('utf-8'), self.top_level
++            )
+ 
+         setup_translation()
+