gentoo auto-resync : 07:01:2025 - 06:41:06

4 files changed, 275 insertions, 2 deletions

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 95fae576ae72..12a84eac994a 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,5 +1,6 @@
 AUX deluge-2.1.1-ayatana.patch 777 BLAKE2B bf5efc4c20b6ceb21d954b6084f005e5f530e66432957b32c15419b51d37be3e53be71b0fc1f172e7df6765767cb135753311f61a516f28780d5bcdff2683873 SHA512 8e82825eeecd10b7f2ed673e9f24a817c1f458eff8afc902a8be8297ff685a91c0a691768bae988b2c8f20d599001161e3d49a32f3c97e0baaa998bcd57d734f
 AUX deluge-2.1.1-consoleui-deferred.patch 412 BLAKE2B 6a69db497983c67920de923452e0a31993084634b742cf514205f55e494bed630e78da4a1b6604acc9de9ecc8629560c61be253636faf5862c150dc4a898fd6e SHA512 ed6e196b7857d0d822792b629dd428001fd59a0c1c1d4f9318623c55d2ae07796a00425695c4ca1a0521ba1b469a8a8632f525bc17d8a6e142d59e277b72e255
+AUX deluge-2.1.1-email-module-replace.patch 4068 BLAKE2B 15da816102e561ff1fdc1d56db1bf4e35dc94069cf864ec8013c60b840f133da14a171f1492060ac05a843958b22103672109294eaf2bb236251b76ce9ad839c SHA512 97c6711746c03dd420a45d6428c5ef47029a54efad4d860184332272143df23187bc2d8b1c93d4876aca3e0050bd473a5ea18ad53d7eeb8a28a13ca03ec631ae
 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
@@ -11,6 +12,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-r5.ebuild 5959 BLAKE2B 2061a623009669b778c127fa01df70ba35b0d3387a67b8f5ac41ff399a38b6fd5204b280ff3d14a4127aa225bdcea4ba4a0a9fdc6330ac168a9902e5773c9ead SHA512 8de3aed13e65ab5fb99099614a2d3f2587359f2256c6b80a0ac6efa13f65a07841f019c0185dacb2deef59bacfda832d4f3a0c24ba9b47b4422555d1b65c642f
+EBUILD deluge-2.1.1-r5.ebuild 5959 BLAKE2B dbbda54847a964835196452e89a6c5650095174557b5f7f2f07fe4bcafd62e3082c35bacc842dca331af176f6c589b23fced3d36fc1af7080b9075d0ad5f5478 SHA512 d5f8315ac5157c134d7bd26bab6b784d70be43af3b6fac37314bc72d48cff3c3b40a75add23cd390476091f35a4b94676c84487cd3b2588472c910c4eba58613
+EBUILD deluge-2.1.1-r6.ebuild 6008 BLAKE2B 38540cbf380206c1e72d1cace8daff94a639a7cf65d7e9a643ad69d71db09a3b83f5089ee28d2bab39f08d5d812be6f33922329b725feb37baae38dec21d5491 SHA512 53e75e1654fbe0f66979c2bfb6bbd3396da83b195a2579ce500682fc1f6b6aa1b062fee1edb0ae7807a9471ab77e6deb772a0309eb793afdf8cfacea7486d79f
 EBUILD deluge-9999.ebuild 5632 BLAKE2B 8a48e523583a95d946d08be33f04b2fb01a1705f077f8cb1070e70e56918a814a1ede274bdf4eeddad7ead2ef39d83ef40127f5ec961298d3fb9e47de97d7537 SHA512 7466329831a20d77fe9de327e4b0fa8cca5a57a5105eb29854e1ce505e6e4f379aa42c1dccbd3bfab9b2a2ea6ffd58c51208cd7ae89d6fbe9c18b7cf7b074f1b
 MISC metadata.xml 763 BLAKE2B 8d0ee2a486c2755cda79b56d622c96803c2b2538bd8f3c4598381bfe3a03572c0503510eb7952c37b5432fa1a9d6db73badbd02b939961fb81567149d9fb8a5f SHA512 f6bbd8504c4edfc5b9420a1d7c52e56f3ebe5f8f92b5db3b5a954b9324e1a6cf7938a9e1d8d98305d3fed42422d584f31f0d17fdb884e05ed01480075600fc06
diff --git a/net-p2p/deluge/deluge-2.1.1-r5.ebuild b/net-p2p/deluge/deluge-2.1.1-r5.ebuild
index c03f9d0f3185..5d9ec6ed1c78 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_{10..13} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 inherit distutils-r1 systemd xdg
diff --git a/net-p2p/deluge/deluge-2.1.1-r6.ebuild b/net-p2p/deluge/deluge-2.1.1-r6.ebuild
new file mode 100644
index 000000000000..9e8a39ca5453
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.1.1-r6.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+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/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"
+	"${FILESDIR}/${P}-email-module-replace.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/files/deluge-2.1.1-email-module-replace.patch b/net-p2p/deluge/files/deluge-2.1.1-email-module-replace.patch
new file mode 100644
index 000000000000..eefcd2b8d52a
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.1.1-email-module-replace.patch
@@ -0,0 +1,95 @@
+From https://github.com/deluge-torrent/deluge/commit/5d96cfc72f0bfa36d90afd2725aa2216b8073d66
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Thu, 29 Aug 2024 15:31:25 +0900
+Subject: [PATCH] [UI] Replace deprecated cgi module with email
+
+As PEP 594 says, cgi module is marked as deprecated
+in python 3.11, and will be removed in 3.13
+(actually removed at least in 3.13 rc1).
+
+As suggested on PEP 594, replace cgi.parse_header
+with email.message.EmailMessage introduced in python 3.6.
+
+Updated test modify test_download_with_rename_sanitised
+- With RFC2045 specification, Content-Disposition filenames
+parameter containing slash (directory separator) must be
+quoted, so changing as such.
+
+Ref: https://peps.python.org/pep-0594/#deprecated-modules
+Ref: https://peps.python.org/pep-0594/#cgi
+
+Closes: https://github.com/deluge-torrent/deluge/pull/462
+--- a/deluge/httpdownloader.py
++++ b/deluge/httpdownloader.py
+@@ -6,7 +6,7 @@
+ # See LICENSE for more details.
+ #
+ 
+-import cgi
++import email.message
+ import logging
+ import os.path
+ import zlib
+@@ -133,9 +133,10 @@ def request_callback(self, response):
+                 content_disp = headers.getRawHeaders(b'content-disposition')[0].decode(
+                     'utf-8'
+                 )
+-                content_disp_params = cgi.parse_header(content_disp)[1]
+-                if 'filename' in content_disp_params:
+-                    new_file_name = content_disp_params['filename']
++                message = email.message.EmailMessage()
++                message['content-disposition'] = content_disp
++                new_file_name = message.get_filename()
++                if new_file_name:
+                     new_file_name = sanitise_filename(new_file_name)
+                     new_file_name = os.path.join(
+                         os.path.split(self.filename)[0], new_file_name
+@@ -152,7 +153,10 @@ def request_callback(self, response):
+                     self.filename = new_file_name
+ 
+             cont_type_header = headers.getRawHeaders(b'content-type')[0].decode()
+-            cont_type, params = cgi.parse_header(cont_type_header)
++            message = email.message.EmailMessage()
++            message['content-type'] = cont_type_header
++            cont_type = message.get_content_type()
++            params = message['content-type'].params
+             # Only re-ecode text content types.
+             encoding = None
+             if cont_type.startswith('text/'):
+--- a/deluge/tests/test_httpdownloader.py
++++ b/deluge/tests/test_httpdownloader.py
+@@ -206,10 +206,10 @@ async def test_download_with_rename_exists(self):
+         self.assert_contains(filename, 'This file should be called renamed')
+ 
+     async def test_download_with_rename_sanitised(self):
+-        url = self.get_url('rename?filename=/etc/passwd')
++        url = self.get_url('rename?filename="/etc/passwd"')
+         filename = await download_file(url, fname('original'))
+         assert filename == fname('passwd')
+-        self.assert_contains(filename, 'This file should be called /etc/passwd')
++        self.assert_contains(filename, 'This file should be called "/etc/passwd"')
+ 
+     async def test_download_with_attachment_no_filename(self):
+         url = self.get_url('attachment')
+--- a/deluge/ui/web/json_api.py
++++ b/deluge/ui/web/json_api.py
+@@ -6,7 +6,7 @@
+ # See LICENSE for more details.
+ #
+ 
+-import cgi
++import email.message
+ import json
+ import logging
+ import os
+@@ -191,7 +191,9 @@ def _on_json_request(self, request):
+         Handler to take the json data as a string and pass it on to the
+         _handle_request method for further processing.
+         """
+-        content_type, _ = cgi.parse_header(request.getHeader(b'content-type').decode())
++        message = email.message.EmailMessage()
++        message['content-type'] = request.getHeader(b'content-type').decode()
++        content_type = message.get_content_type()
+         if content_type != 'application/json':
+             message = 'Invalid JSON request content-type: %s' % content_type
+             raise JSONException(message)