gentoo auto-resync : 19:05:2023 - 16:15:42

4 files changed, 17 insertions, 175 deletions

diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 38075c13971d..95a48aa7fc10 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -1,4 +1,5 @@
 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-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,7 +12,6 @@ AUX deluged.service-2 243 BLAKE2B 461d160a901c804cc405fa1c95ea5eb41feac701577da7
 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 64b8a4aa157ee7afb8909bcb70402119053c32ac411899e1d774c2b444c0f422f015ecf905def1189e3d5b8bcb0e950394e1a4cc9cb1d80be01cad18ab8e5364 SHA512 d702f35a1c2b99ae3fbd46912bd2fe48397f96f3f0b4a238583d3c732e286983d89e3b1cbdf67441a59a142fa7ea981c5d310dc70e6bf58ce87bde9a59fb479b
-EBUILD deluge-2.1.1-r2.ebuild 5887 BLAKE2B cfabc9b31d58427fa534d770b3d688e8d55556add56f410a2e32f656ae975c2eaea6a83c2a77b3b46dfbd9716417a0013072f58085df8dab2a990748c457d343 SHA512 873bebbc3cebda402a83b7a9bd669a926143c4718ca52c63fb307ed8a578f86e6afc04c25e8ebac3fba45abc06693640aeacf6e597c6c647f8496f302448b604
-EBUILD deluge-2.1.1-r3.ebuild 5968 BLAKE2B 4dd3e343b571ab60af2153734e1084a9bbcfc3c433e55e8d9da504fb3427393037698ec46d53629675134b132f32f3a6a3976e46f3c123ab6d8b45b951175b82 SHA512 4d475c8f37e8ea3ebfb375b4f27b62a6a5b57a86559e643f78fea4bdd78c74a594076bd4d6f7d2ad12e347ec8a08eb4d2867015b64ce9542012c6a5a481f0e6a
+EBUILD deluge-2.1.1-r4.ebuild 6059 BLAKE2B 3a75fdbee99326fa0a5672d9a339eaaed6aeca760b69b4c27643a7d971fe69b95b28528590eb0cd265539aa697c481fa1a120ac18a07e368b0cbf48170118842 SHA512 2bf8c08b6ce8e259b68cc94d270dab1a2fad09242f04c300c741a3356fed65a3f1fb677c7b4e803473124d7f9b34e0bdabb37d6cc353cad492ad69657e1d0772
 EBUILD deluge-9999.ebuild 5730 BLAKE2B 92cca11b8ac32554e6ee2523e91962a4ce2839920c995904616f22ca0d013f112d28c30258eecc98271a0860038972775734e222bc8275a2444cad99333e9520 SHA512 ae90bff57e2a0df1ac08e312ff25d21e942e90ae9e16ac41a3e788eabf5b703ea0dafc52d863fcc9d96c9105c278889209b5c6428391260011d7bf1547047f96
 MISC metadata.xml 763 BLAKE2B 8d0ee2a486c2755cda79b56d622c96803c2b2538bd8f3c4598381bfe3a03572c0503510eb7952c37b5432fa1a9d6db73badbd02b939961fb81567149d9fb8a5f SHA512 f6bbd8504c4edfc5b9420a1d7c52e56f3ebe5f8f92b5db3b5a954b9324e1a6cf7938a9e1d8d98305d3fed42422d584f31f0d17fdb884e05ed01480075600fc06
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-r4.ebuild
index 2d6ade36c4d5..578a7a9dcdc9 100644
--- a/net-p2p/deluge/deluge-2.1.1-r3.ebuild
+++ b/net-p2p/deluge/deluge-2.1.1-r4.ebuild
@@ -68,6 +68,8 @@ 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
diff --git a/net-p2p/deluge/files/deluge-2.1.1-consoleui-deferred.patch b/net-p2p/deluge/files/deluge-2.1.1-consoleui-deferred.patch
new file mode 100644
index 000000000000..55917cca6762
--- /dev/null
+++ b/net-p2p/deluge/files/deluge-2.1.1-consoleui-deferred.patch
@@ -0,0 +1,13 @@
+Bug: https://dev.deluge-torrent.org/ticket/3582
+git: https://github.com/deluge-torrent/deluge/pull/408
+
+diff -ru a/deluge/ui/console/__init__.py b/deluge/ui/console/__init__.py
+--- a/deluge/ui/console/__init__.py	2022-06-28 11:57:49.000000000 -0700
++++ b/deluge/ui/console/__init__.py	2023-05-01 18:32:19.261457877 -0700
+@@ -12,5 +12,4 @@
+ 
+ 
+ def start():
+-
+-    return Console().start()
++    Console().start()