gentoo auto-resync : 25:07:2023 - 05:42:52

7 files changed, 3 insertions, 628 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index faba31cf24a2..d45898b2c9cb 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 1d347e5beb17..46f43f44d840 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,14 +1,7 @@
-AUX sabnzbd-3.7.2-tavern-2.patch 5773 BLAKE2B 20bfd9bae283d9e520b83962cfcd4558cb9b2d77923b430870ba979ff3cab06920cc2049a2a4370953d92d392543468b7dc128b5d4dff9cc80d17ba6d95aee7a SHA512 e040b0ac4803f26cf04ff4ec162f111aad3593ae936dc86322398d5738a8048578e19fe444c8ec8e374e5b7fbd5f6b9a4c0edbd081805166cef9baff81f51e97
 AUX sabnzbd-r1.ini 322 BLAKE2B a0afea7621d0385f2d5d01f7b9bff2afaa87efdf8b8cbea19953d572a8369e89ff268d1d92fa1625c9bf684199c6211309667c552d63297c4f01bf40f48332f6 SHA512 ef5cbb8fd8bd9a5636cd082a59e0f31d989bafa4a17b4d87ed6c66254f43b05c759bd021e8c1ea5c2ac24e5538e82dc45199f8cacfb25403a882a8e80259c6d9
 AUX sabnzbd-r1.initd 1391 BLAKE2B 1ff6d3dc4f5ece413cf1c0ab104b23c3a4ab451d5cda283327ca781acee88dcbbe22cffc15a725f6f6825a123f0db94fbad017fb7343c05f47ad02a02b68a235 SHA512 c5be8bf0a0053e1a5a6458b7a86c994e636845be2721dc0b14e76ed425ed077274ecbc800724502fa9fa543714470bbede219ec06e7b5dbd310e07c9a14f644c
 AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b314b3a7a12742ae4da5de93d771f3fb11a8c2ff5a7eef8fc1b879c1d85757ce218d9357037a70d6 SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
-DIST SABnzbd-3.7.1-src.tar.gz 5108463 BLAKE2B 5858fc5ece3948696132c64c1f4a7459319bbc604074dc78339e54e7e77353dbd141b4aad0c0cd027ac6ea1499aee0100ed7f4a1b20d0786728503eb6ffad055 SHA512 c76f74e20943196467206b5c0427421d7fe4e614855c477a045d06854c5247c13056ce9055d82b5f0c6391a046dc3c65c577e50fc30646c8f2290df4bada4fb9
-DIST SABnzbd-3.7.2-src.tar.gz 5108729 BLAKE2B 8c279663f5395b613e7122e349971994f98b3ef22d23f18083b64864bc6e27653ca525a59226d2af5dc10a8cfd7509014c60e5b322137239e6eec03239746768 SHA512 d5fa9dc1a3114bd0806e580a170552fb8821e375790c2b95c7add4b25a4ceabad24111c4d6a9c12bcc9447dc0a5cbf6a8595e0142a74ee9d161849a9e55609e9
-DIST SABnzbd-4.0.1-src.tar.gz 5079799 BLAKE2B 5020b0f906bdb87b5eb287fee321fc765ad959754f3293395275930deab7baf8533f575993ff5c02cfbc646745eefee1ca4aa8cbeaba94d15c43a4dc8d5c78e6 SHA512 98958e9c6b35118781fec28853f1b9a0405bd262aba734af22c0bb64d5d25899c49bcb3aac4f449baccc629da6739ab1c4a33f5947c61646b35788d9e971e9cb
 DIST SABnzbd-4.0.2-src.tar.gz 5081392 BLAKE2B 1740aad2a5b248b22dda42cb22b740c54d792e726bec27c832ffc8919d863f1cec26aaff4e789e0dd8ae3647332f9aa9b26ca5422ce7baf955f8c37ac8c22142 SHA512 2f0d2297449ecbf8ddbb7a571f6dfa6717c5b118389a67e46072f25daca16d2983827e8f17e1cf016fbf2985fa5594dbafc62cf13601607dc2b4d9849098982b
-EBUILD sabnzbd-3.7.1.ebuild 4786 BLAKE2B 5e627a67df321770413b02bce15201eca1b1e4ea136dbc9577dafd57fd1ac6ec2a6e99d2fd890c3a826bdf8beaa747f60a519b2b0b2e175fbaf8675370e2c258 SHA512 7f9d136ade530658bd45c1cd2f285c05c3ab1eafaaedafd9ca568cc4599dffdca01788c649adfbde9d911da23db42d6b6a823b18b1e9b3a019be1f063e89178a
-EBUILD sabnzbd-3.7.2-r1.ebuild 5001 BLAKE2B 32794b68db46c31722c50cdd0f5818445dc1be310868bce676ae5014edc8c90fcf76e7c092f87031b50db0d0f74fa703e8bcc559a60e5fa015c2dcd680ee7a21 SHA512 87e11011df2afb42d3117310ef0c388131433b3af807cf05b67d796636889475fc2787feaa431e042a223ad8446298d5380b6882ae77b758d5bda29cd9acb6e2
-EBUILD sabnzbd-4.0.1.ebuild 5217 BLAKE2B 9074765a16b2b1a05623061e22353c4646470b432f5ae476f9931447757bd92fc56325f4de4ee242b0976afc4b814161c9579bff85547f8129b5aa3364f23092 SHA512 d259b17b02eec8cb1d6da09e06397a143cae3962b091caf31d02482625da6501b53f42f3ea1ad1a09a82159d3e49a7d0e784df8b13378ba3fcd0cf85a3f6a3ea
-EBUILD sabnzbd-4.0.2.ebuild 5175 BLAKE2B 0c5ff4e87f004bb2018cf12fb44edd9ed9fef7231fc20434a6e576869f405c41d72bd2f77c54162f078b1784d2c2be9e34b1f4b23dfe24f712ebaa5afd0f8b4a SHA512 ceea1b07fecf07e0d04fabb81878ae72c1d4a6816982a72f7e59717008584b4243a1b350eb162427ae9780c679cd869276070552fd6b6b7e195b546fcd1bebe0
+EBUILD sabnzbd-4.0.2.ebuild 5176 BLAKE2B 8465d7dd954d88670b2cd97973d9fd52c131460434e33f6b33b03fc04efac2ec846b671f54250d60e140ca7ce26bf0aa8d792ae54c4710ffcc5a0b3b1bcc4f73 SHA512 6704362c44f39983ad66bcf8079fc69ffd0389e3fd6e233edaa9b758cf489d1f3440776e312efcf00ce3f0b93ecd8be3dd0f4f4ba1df7bf70b2c3fa84119dade
 MISC metadata.xml 463 BLAKE2B 90b3702d7d29524a2f0c450d757fa35178211816fbf04661251a257d681d0af7ca7020f920e51fb1ae380fa24c5dd473588ae8ea42f1eb4982246c903872becd SHA512 ea4d26003fa929bc21a5678633a8df6cf76a6ce4dc4a6c33c15207e41fd147e94e2632dfcf3c1bfd46467920d8c46a667ec83fe71caa1347a5da2b798dffc329
diff --git a/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch b/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
deleted file mode 100644
index 60945d596d41..000000000000
--- a/net-nntp/sabnzbd/files/sabnzbd-3.7.2-tavern-2.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From c8125e93bfb0963876992cb50c2442220c0ec300 Mon Sep 17 00:00:00 2001
-From: jcfp <jcfp@debian.org>
-Date: Mon, 20 Feb 2023 16:29:34 +0100
-Subject: [PATCH] convert tests to tavern 2.0.0+
-
----
- tests/data/tavern/api_get_files_format.yaml | 2 +-
- tests/data/tavern/api_history_empty.yaml    | 2 +-
- tests/data/tavern/api_history_format.yaml   | 2 +-
- tests/data/tavern/api_queue_empty.yaml      | 2 +-
- tests/data/tavern/api_queue_format.yaml     | 2 +-
- tests/data/tavern/api_server_stats.yaml     | 2 +-
- tests/data/tavern/api_version.yaml          | 4 ++--
- tests/requirements.txt                      | 2 +-
- 8 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/tests/data/tavern/api_get_files_format.yaml b/tests/data/tavern/api_get_files_format.yaml
-index e46823085b..9315fc27f8 100755
---- a/tests/data/tavern/api_get_files_format.yaml
-+++ b/tests/data/tavern/api_get_files_format.yaml
-@@ -56,7 +56,7 @@ stages:
-         pragma: "no-cache"
-         access-control-allow-origin: "*"
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           # Verify response parameters with a regex using positive
-           # looksaheads, so parameters match regardless of their order
-diff --git a/tests/data/tavern/api_history_empty.yaml b/tests/data/tavern/api_history_empty.yaml
-index 0d15faabd5..22fa4e4511 100755
---- a/tests/data/tavern/api_history_empty.yaml
-+++ b/tests/data/tavern/api_history_empty.yaml
-@@ -54,7 +54,7 @@ stages:
-         access-control-allow-origin: "*"
-         content-length: !re_match "[0-9]+"
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           # Verify response with a regex using positive looksaheads so
-           # parameters match regardless of their order of appearance
-diff --git a/tests/data/tavern/api_history_format.yaml b/tests/data/tavern/api_history_format.yaml
-index 99c64098e1..45de020706 100755
---- a/tests/data/tavern/api_history_format.yaml
-+++ b/tests/data/tavern/api_history_format.yaml
-@@ -87,7 +87,7 @@ stages:
-         access-control-allow-origin: "*"
-         content-length: !re_match "[0-9]+"
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           # Verify response parameters with a regex using positive looksaheads,
-           # so parameters match regardless of their order of appearance. Note
-diff --git a/tests/data/tavern/api_queue_empty.yaml b/tests/data/tavern/api_queue_empty.yaml
-index d80d026e0e..5a3f45e2ea 100755
---- a/tests/data/tavern/api_queue_empty.yaml
-+++ b/tests/data/tavern/api_queue_empty.yaml
-@@ -78,7 +78,7 @@ stages:
-         access-control-allow-origin: "*"
-         content-length: !re_match "[0-9]+"
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           # Verify only a bunch of key response parameters with a regex using
-           # positive looksaheads, so parameters match regardless of their order
-diff --git a/tests/data/tavern/api_queue_format.yaml b/tests/data/tavern/api_queue_format.yaml
-index 8411f4a272..fcbe708785 100755
---- a/tests/data/tavern/api_queue_format.yaml
-+++ b/tests/data/tavern/api_queue_format.yaml
-@@ -98,7 +98,7 @@ stages:
-         access-control-allow-origin: "*"
-         content-length: !re_match "[0-9]+"
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           # Verify only a bunch of key response parameters with a regex using
-           # positive looksaheads, so parameters match regardless of their order
-diff --git a/tests/data/tavern/api_server_stats.yaml b/tests/data/tavern/api_server_stats.yaml
-index b42a1f2a38..a94a3b7823 100755
---- a/tests/data/tavern/api_server_stats.yaml
-+++ b/tests/data/tavern/api_server_stats.yaml
-@@ -47,7 +47,7 @@ stages:
-         content-length: !re_match "[0-9]+"
-       status_code: 200
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           expression: "{{(?=.*'total': [0-9]+)(?=.*'month': [0-9]+)(?=.*'week': [0-9]+)(?=.*'day': [0-9]+)(?=.*'servers': .*).*}}"
- 
-diff --git a/tests/data/tavern/api_version.yaml b/tests/data/tavern/api_version.yaml
-index ca11906cc9..8e81493353 100755
---- a/tests/data/tavern/api_version.yaml
-+++ b/tests/data/tavern/api_version.yaml
-@@ -35,7 +35,7 @@ stages:
-         content-type: !re_match "text/plain"
-         content-type: !re_search "charset=(UTF|utf)-8"
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           expression: "{SAB_VERSION}"
- 
-@@ -53,6 +53,6 @@ stages:
-         content-type: !re_match "text/xml"
-         content-type: !re_search "charset=(UTF|utf)-8"
-       verify_response_with:
--        function: tavern.testutils.helpers:validate_regex
-+        function: tavern.helpers:validate_regex
-         extra_kwargs:
-           expression: '<\?xml version="1.0" encoding="UTF-8" \?>\r?\n?<version>{SAB_VERSION}</version>'
-diff --git a/tests/requirements.txt b/tests/requirements.txt
-index ea2fe6c403..60c160fe40 100644
---- a/tests/requirements.txt
-+++ b/tests/requirements.txt
-@@ -9,7 +9,7 @@ pytest-httpbin
- pytest-httpserver
- flaky
- xmltodict
--tavern<2.0.0 # tavalidate does not support tavern 2.0.0+
-+tavern>=2.0.0
- tavalidate
- importlib_metadata
- lxml
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
deleted file mode 100644
index 01d022e53ae2..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
+++ /dev/null
@@ -1,156 +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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			dev-python/pkginfo[${PYTHON_USEDEP}]
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-		# requires tavern
-		tests/test_functional_api.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-	)
-
-	epytest -s
-}
-
-src_install() {
-	local d
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto /usr/share/${PN}/${d}
-		doins -r ${d}/*
-	done
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild
deleted file mode 100644
index 53c0115cfa85..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.7.2-r1.ebuild
+++ /dev/null
@@ -1,166 +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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
-	')
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/tavalidate[${PYTHON_USEDEP}]
-			>=dev-python/tavern-2[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND="
-	${DEPEND}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			dev-python/pkginfo[${PYTHON_USEDEP}]
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-tavern-2.patch
-)
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=tavern._core.pytest
-	epytest -s
-}
-
-src_install() {
-	local d
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto /usr/share/${PN}/${d}
-		doins -r ${d}/*
-	done
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-4.0.1.ebuild b/net-nntp/sabnzbd/sabnzbd-4.0.1.ebuild
deleted file mode 100644
index 2165b8fa339e..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-4.0.1.ebuild
+++ /dev/null
@@ -1,168 +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} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_alpha/Alpha}"
-MY_PV="${MY_PV/_beta/Beta}"
-MY_PV="${MY_PV/_rc/RC}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.7.1[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-7.0.2[${PYTHON_USEDEP}]
-	')
-		test? ( $(python_gen_cond_dep '
-				dev-python/tavalidate[${PYTHON_USEDEP}]
-				>=dev-python/tavern-2[${PYTHON_USEDEP}]
-			')
-		)
-"
-RDEPEND="
-	${DEPEND}
-	>=app-arch/par2cmdline-0.8
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			dev-python/pkginfo[${PYTHON_USEDEP}]
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		'tests/test_newswrapper.py::TestNewsWrapper'
-		# Doesn't work, complains mocker missing even when pytest-mock installed
-		'tests/test_dirscanner.py::TestDirScanner'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-		'tests/test_functional_sorting.py::TestDownloadSorting'
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x PYTEST_PLUGINS=tavern._core.pytest
-	epytest -s
-}
-
-src_install() {
-	local d
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto /usr/share/${PN}/${d}
-		doins -r ${d}/*
-	done
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-4.0.2.ebuild b/net-nntp/sabnzbd/sabnzbd-4.0.2.ebuild
index c8110322c093..3cecba4b03be 100644
--- a/net-nntp/sabnzbd/sabnzbd-4.0.2.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-4.0.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 # Sabnzbd is GPL-2 but bundles software with the following licenses.
 LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -42,7 +42,7 @@ DEPEND="
 		dev-python/notify2[${PYTHON_USEDEP}]
 		dev-python/portend[${PYTHON_USEDEP}]
 		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-7.0.2[${PYTHON_USEDEP}]
+		~dev-python/sabctools-7.0.2[${PYTHON_USEDEP}]
 	')
 		test? ( $(python_gen_cond_dep '
 				dev-python/tavalidate[${PYTHON_USEDEP}]