gentoo auto-resync : 26:08:2022 - 14:52:16

8 files changed, 245 insertions, 49 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 37e5fd6ffb50..1d50d53a962e 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index baf598a02395..084d7e8239a2 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -13,4 +13,4 @@ EBUILD bitcoin-qt-0.21.0.ebuild 4946 BLAKE2B 49170bbc182529f28bfbf60b24fa5bcbe24
 EBUILD bitcoin-qt-0.21.1.ebuild 5710 BLAKE2B deaad27da303d6e493c2ff575d705ed8336127a4ce677a7116a5ceec51be50d410c88d55800556e18e61763737da93d5330ed5ecf93f138b4aeed2d4b2391bdc SHA512 664f4539eacb702b8df2aa68fba72c6997adf5683ee57bf45381060f1a79e2fc7884c96213b6417d6ed2148e2a7a57966b756ea3fadc5233a743ef22cc4479a0
 EBUILD bitcoin-qt-21.2.ebuild 5728 BLAKE2B f8f2aa8dd9efb106bac9f6261341412bd98a05e39894104d7e6ff3b42dfee670c00712c63c70538b8db4eaa8078c1f2095d5780bd88fca57b10b3766b91782c5 SHA512 f63b773b4885347ab57e3ec0d76a21dc7364a8d5efbe345a6ac2d9456db7e6d12e09b48beff5c0efbfee8f5a24500cc179487faf851f8aaf3a848ee2490f92a2
 EBUILD bitcoin-qt-22.0.ebuild 6229 BLAKE2B 05eb4550dd6f2cb1e949d6298545641a29fa1091a337abfb5552fd443818f0e5d1bd6eccad51325162482e3fe30361a3de85cd61f2e2e00f4c54ba81f85daacd SHA512 1414ed6a2da2112a8a47e67e5e553b7efbcb2b575cfa1a4a46ed29e0ccfeba2e833de23fa37776623dc24b7647d07e227ee516021567693f596e54e54490fc0d
-MISC metadata.xml 1423 BLAKE2B fd0f17862c8011671527d5769b37c927eb3cb43a280b27400585997f33fb611ebdc7666b13cb5c10f740022305fe3b371818781320aa23e82438c2e9cc828607 SHA512 146b06582d0bd1d04895fcfa3746994536a2c868131f98f9cc77a59c5ba9ea7a362506e64e760627f7ec69c07455bc6924721d79da32c798c4e29c6d7a0827e0
+MISC metadata.xml 1434 BLAKE2B e6e1f0ffac2e6be3bc19fe8bb8e9b18b5b50da6255d70d92fdc28a6e040b54ed4d5b94643835043eb64eae0273111f73c30e93a6d9b7203368aeedb880961c8a SHA512 5e7f2f044b27e4ac21d1e18d177bb1bd493feaad5598ad44abed8a0053403565100877498da29aa4f35e59d570d2a499daea58285dd59f3e62eafba7ee3460e7
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index a9bf222e3a6a..1cbb77514885 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -15,7 +15,7 @@
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="nat-pmp">Enable NAT-PMP port forwarding</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
-		<flag name="system-leveldb">Use the system-wide dev-libs/leveldb instead of bundled</flag>
+		<flag name="system-leveldb">Use the system-wide <pkg>dev-libs/leveldb</pkg> instead of bundled</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 99a365393ddb..136932773e39 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -14,4 +14,4 @@ EBUILD bitcoind-0.21.0.ebuild 4857 BLAKE2B 51ffdde51af712587838a530939af59fab900
 EBUILD bitcoind-0.21.1.ebuild 5622 BLAKE2B 1e025725f353a6b959918e0e029a0462b238fc053540180909922d6eb0056924b0c295fbf7c72985c6c0319e00549539dbb8e4f53c3dd1c43101e2d3536a54b5 SHA512 7656a4b9eacc1a782996ec49ab2433e8450bf25b180c9a97809d342a2e36f294aba64b6cb66da711640e464aa14053b192b1cd090c9eab2de6242c8f57a9431a
 EBUILD bitcoind-21.2.ebuild 5640 BLAKE2B 5f4bfb3ae3b536fd9b2d80ba801d97ddda731dcb96dd49be01ec4358708bab95ad4442a2ff586210d956c9bc6d0acb2082280ef1d34dcd3be5782f6aabc1b8cd SHA512 1b94295aee98495397dcb838362dead51d4fd8c02c9e14120ab30f3d703d18abca0963b47b9c9e6ca2b6b2e14e9abacfc2f6791b679367ecaf1da71aa14f4a56
 EBUILD bitcoind-22.0.ebuild 6142 BLAKE2B 8986389696a658b0d325b15f01c704c941b70aebece84367c1426b7a1897733187cc0859bef5bf4db87985d3d5ee64f3fa415ff89e37096c607373bd1e0c36cc SHA512 17a703cd664e53bcd49d39d25d8d61c1342dfa5b6a8894d2c029e49870aa6be291dd48542146d210a58e97551a3fa927fe15fec6558c0f2cc2ff19c4df0b92bd
-MISC metadata.xml 1341 BLAKE2B 0d182072961f09b69e0e8892a4ae4cf188c24d53559ac4d144994ae25ba00f241984de8eaf4976a79a482269cf6410d9b9cfa2a953b9a8b640b10c70b71e00c1 SHA512 e30b396262383a21ff1cbc0b369ca655cf63eecb9a7e6165978081d9661086021e65eef330d7e9da2228a639407e8abe5c2cdcc000f0f85f5d10f00f95345024
+MISC metadata.xml 1352 BLAKE2B a924424d5811e88d1dbc6cff68289695e270854d8afb811c4d5d682fc893d2434d166f26c229e5f8ab62e4161944940ee6eb55aa3149b93d69f288a023aa6d3d SHA512 a024d33e339da9e75e10137568503187f186fc717d6bc1f170e478f06fb577340b36a7f13fea070ef98faa97c8bc52e4f60698df4a09b28050656ddd06d842fc
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index f9b7f2ec5cf7..651c8b9cb191 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -14,7 +14,7 @@
 		<flag name="external-signer">Include support for external wallet signer programs</flag>
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="nat-pmp">Enable NAT-PMP port forwarding</flag>
-		<flag name="system-leveldb">Use the system-wide dev-libs/leveldb instead of bundled</flag>
+		<flag name="system-leveldb">Use the system-wide <pkg>dev-libs/leveldb</pkg> instead of bundled</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
diff --git a/net-p2p/deluge/Manifest b/net-p2p/deluge/Manifest
index 34b551390de0..c24d514f8c5e 100644
--- a/net-p2p/deluge/Manifest
+++ b/net-p2p/deluge/Manifest
@@ -9,6 +9,8 @@ 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.0.5.tar.xz 1895268 BLAKE2B 2c815aa9dbbbed5ba780d694b0518f224577b9c370a03712b15c706eda6de55e34b834f624ec18001c9d41b925677b6a001a384691a7ffd9f29c16731a735d4b SHA512 6c2994ca2906fdb92e96aa3534a4ffd5199e9ab6a1b5b12de94c94ec29850cad0cef7546ae1bea5188075fd16a07e584a17bf2f8b5eb1d2b91dee2da1e494588
+DIST deluge-2.1.1.tar.xz 2541968 BLAKE2B 3fe59ad8b402281dd0e19504d10a8d9e2967911e9967613a0d5a146d9ca261cb59d2208f8bd529e7f1da824e125ffb590d12b337dd9655e78b54252b021ae8da SHA512 e94208981aee45f42b88e1c544b07e7b0d0f2c4ade6b7f37257b69d4a3394c89aff217cde699e79ad59de6d2ee4eca7a558f2b85505d2140ba73f1f76f184455
 EBUILD deluge-2.0.5-r2.ebuild 4454 BLAKE2B 25716e62d58d1a7a00c2a2cd1fea17499989baaa41d0df033666a9185aec345b9a33aea3d716e99d66a358a156f2ca668f3012cd9373c99aa7957e2bc34e6a4c SHA512 f3ab9fcd00befbc3fce304dd6469f5b4bb1ff56e1aa06ce1542277a2913639ad200fb7fa8d34b07fef392f1f9d515a32c683030324945435ea18bfff6ea424ed
-EBUILD deluge-9999.ebuild 4449 BLAKE2B 4c831317a07fa3ec23924910324629825d0d848a8fe107e3281b30c1afbd415d09d47429cb95d41de4f48b40f4ca217d75ae60ee959c678e3d92487012ffcf92 SHA512 39e065ff26f8839b73c6c1ce382c5b81a9d0a9c318f8f155f662f36f1487d819893b7c38c690a7cc8d50fefb4defd46df4e0d76a83ed6211d2924fa4972c0384
+EBUILD deluge-2.1.1.ebuild 5711 BLAKE2B 709c4730d11418835f1e50b0c15f49181e513528e6d85b4a9d15b0c31ee34ef0883ff7615313b9c7017c8138a62886a7b7efad0bb57ebad44b7bff26c8196418 SHA512 6541d0a183cdb7f10690e5b66ed3fac442c81fb64c61cfdd3c9cc48d3e15391fac1b2fde3af03614b9293a94c4a31a0fa58ee2723a59c29be2c7463b365b5fe1
+EBUILD deluge-9999.ebuild 5706 BLAKE2B 2f44718393064063f6dbd0733da5f6a08497670d1a2f72addceb19d0789d0e75c2d00aff3a9b001f46b156d87552b422d8f681a00ec34c28fe4b700347e9e474 SHA512 df34361d09e385a5a4ea9e96873a9cf09f960e156908cdd140fcdb2f985aeb7a7e5a2bcc82425f5159a5409cd6c625ef7b859da6939910ce1219304be250d945
 MISC metadata.xml 675 BLAKE2B 79c1f6e56c1e5331a1722d6b98da4431e0fd9e19d1c1fd00677c20e3d2214f97d4f71b751edac9ef70e2552abac2b650ed704121275a218374386ff95ef404dd SHA512 1da3e3937d14728111aff841900bcb33912ffe29cae6c14dc401547897d777df37e373f2f65ba0fde00624855d33222445ec3a4edcc0478976bb992ac915d5b1
diff --git a/net-p2p/deluge/deluge-2.1.1.ebuild b/net-p2p/deluge/deluge-2.1.1.ebuild
new file mode 100644
index 000000000000..bce30e659a47
--- /dev/null
+++ b/net-p2p/deluge/deluge-2.1.1.ebuild
@@ -0,0 +1,169 @@
+# 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 ~ppc"
+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}]
+	')
+"
+
+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/deluge-9999.ebuild b/net-p2p/deluge/deluge-9999.ebuild
index 344df118563b..2ebeca0f434a 100644
--- a/net-p2p/deluge/deluge-9999.ebuild
+++ b/net-p2p/deluge/deluge-9999.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
-inherit xdg distutils-r1 systemd
+inherit distutils-r1 systemd xdg
 
 DESCRIPTION="BitTorrent client with a client/server model"
 HOMEPAGE="https://deluge-torrent.org/"
@@ -14,30 +15,39 @@ 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 ~ppc ~x86"
+	SRC_URI="http://download.deluge-torrent.org/source/$(ver_cut 1-2)/${P}.tar.xz"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="console gtk libnotify sound webinterface"
+IUSE="console gui libnotify sound webinterface"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	libnotify? ( gtk )
-	sound? ( gtk )
+	libnotify? ( gui )
+	sound? ( gui )
 "
 
-DEPEND="
-	net-libs/libtorrent-rasterbar:=[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
+BDEPEND="
 	dev-util/intltool
-	acct-group/deluge
-	acct-user/deluge"
+	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}]
@@ -45,32 +55,19 @@ RDEPEND="
 		dev-python/pyxdg[${PYTHON_USEDEP}]
 		dev-python/rencode[${PYTHON_USEDEP}]
 		dev-python/setproctitle[${PYTHON_USEDEP}]
-		dev-python/six[${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}]
-		gtk? (
-			sound? ( dev-python/pygame[${PYTHON_USEDEP}] )
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			gnome-base/librsvg
-			libnotify? ( x11-libs/libnotify )
-		)
 		dev-python/mako[${PYTHON_USEDEP}]
-	')"
+	')
+"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-setup.py.patch"
-	"${FILESDIR}/${PN}-2.0.3-UI-status.patch"
-)
+distutils_enable_tests pytest
 
 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|'
@@ -80,13 +77,36 @@ python_prepare_all() {
 	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_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() {
@@ -96,13 +116,18 @@ python_install_all() {
 		rm "${ED}/usr/bin/deluge-console" || die
 		rm "${ED}/usr/share/man/man1/deluge-console.1" ||die
 	fi
-	if ! use gtk ; then
+	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
-		rm "${ED}/usr/share/applications/deluge.desktop" || 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
@@ -113,6 +138,7 @@ python_install_all() {
 		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
@@ -125,9 +151,8 @@ pkg_postinst() {
 	xdg_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 "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"
@@ -139,6 +164,6 @@ pkg_postinst() {
 	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 "For more information see https://dev.deluge-torrent.org/wiki/Faq"
 	elog
 }