gentoo auto-resync : 15:01:2023 - 11:54:40

10 files changed, 10 insertions, 456 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 81767487cf2b..70f5f5236feb 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 1ecded7d52a2..9b1a9b09e69c 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,12 +2,6 @@ AUX sabnzbd-r1.ini 322 BLAKE2B a0afea7621d0385f2d5d01f7b9bff2afaa87efdf8b8cbea19
 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.6.0-src.tar.gz 5052873 BLAKE2B 41b6fb818e9bcf40bedd16e9b2a0d5b2590cdbef8a29187f0e995d11d036c60364ed6f297eb6c2bb3f257040ef66b9bd26bc8464b9af2adfac3922f4817918a6 SHA512 277953a10211b72532ef4c490cc77516ad4691e15f55bbc08572edba8fc4154ddde5d6bd62ea79c2279dad571038cab25194d6764bf1377dda25d522a5838a92
-DIST SABnzbd-3.6.1-src.tar.gz 5051796 BLAKE2B a123b148290dd135f2eb375ce712b19b241907fd78935d9ec8cbb1b80b695c0aa0f92aff6b533e1966c84b9024f4c154a9708496331f85111906e6b068c22410 SHA512 7864f9252bbe8d66cd307e78911b03973554f1a2ccbba0e5ede536e4b7c679fe48cc1e334209688a9f9cd289b8bafc9a317dd02c6563e4151eba4fe2d81b9ddc
-DIST SABnzbd-3.7.0-src.tar.gz 5107150 BLAKE2B e582aaf09016ae34df8c49a1164d3f7e9a8ee85f734ae1066cc6d2c52f6a50a3de5d4abec30e0465d05629af73f4277920211557692e12f41d4b725476059796 SHA512 dbb18f06a0f5eec9ed4b946560073701bbb80ef20de9403ce92f408e96545fda5f7663dfd603723ea6c396c1a13dbb40e5868175d02e3218843138382c2a1335
 DIST SABnzbd-3.7.1-src.tar.gz 5108463 BLAKE2B 5858fc5ece3948696132c64c1f4a7459319bbc604074dc78339e54e7e77353dbd141b4aad0c0cd027ac6ea1499aee0100ed7f4a1b20d0786728503eb6ffad055 SHA512 c76f74e20943196467206b5c0427421d7fe4e614855c477a045d06854c5247c13056ce9055d82b5f0c6391a046dc3c65c577e50fc30646c8f2290df4bada4fb9
-EBUILD sabnzbd-3.6.0-r1.ebuild 3130 BLAKE2B 26eab87a3149b10ba3927ba4b72b3fb20142987e392c0e839060055a88263af0e0e9cedfbdb172ae44df54aa8c1cde1a3644574a3f4dfd9155ad6e30d193bafa SHA512 52e95ebe7e63fbe682f06379b5badc04da735dc40937016549203b763a3dc8821ea9acb55681655c62aa4f6234a4a7b18d85d458edfbbd74fcdd1f625eaa922d
-EBUILD sabnzbd-3.6.1-r1.ebuild 4760 BLAKE2B 5f3192af4b2145bcb79b8426a2935ae5095fa8307052c485e5048e39f5fb93c0072e5573d8f5a30539198873a5ed7f2768018ce5363ddfd465fa38de187764c7 SHA512 a6d9c6e0105b615929634d10febb22ab472cb2fd371e4721795f7aef20d51069307dda180edb88f06c9e0fb44e42db94d611103b59f78c507ad83207072ab9cc
-EBUILD sabnzbd-3.7.0.ebuild 4818 BLAKE2B fe9fd53f105688c2ad164724787da74c7e7d561b0c8c7d7c725dfe4bc5bc48a231699ea5906056ceb8d75d16c4b45c3a29fdaee65cd0606d814738c77a624dd0 SHA512 0a442f3759b5f30c9b48fc8cc9dceca1200e9e9d588a29686616e0c88614eda5223181ff18593dcd6356125c7e48f3d2d904726587650e4eaaaf207ad06645e4
-EBUILD sabnzbd-3.7.1.ebuild 4818 BLAKE2B fe9fd53f105688c2ad164724787da74c7e7d561b0c8c7d7c725dfe4bc5bc48a231699ea5906056ceb8d75d16c4b45c3a29fdaee65cd0606d814738c77a624dd0 SHA512 0a442f3759b5f30c9b48fc8cc9dceca1200e9e9d588a29686616e0c88614eda5223181ff18593dcd6356125c7e48f3d2d904726587650e4eaaaf207ad06645e4
-MISC metadata.xml 669 BLAKE2B 47998686b1b62f061cd33b5c719dab44f9a72e2b809587af75e17d130095099c03be0f585c6acaeebe8882c00b8d9870a9473cd85102317a4c55b3f3474f0fab SHA512 2c0ab624955c4ff2457d094e7c6bf11ceb098eab1e722fde02c2cb15a517504766e3bb4767961fab7b41bfcaa33d2527afbd159649359ca70428f6ba0849f9f3
+EBUILD sabnzbd-3.7.1.ebuild 4817 BLAKE2B b679d535d7181afb9a053c306fb65c8e56cda6371704b852fa0fd6495faf2b326bfe608955bdcca9ebb4a7ecc627adb447d99f95a1d2194c49aedea7e6039d6c SHA512 46d48b0dc40b8e72cfc28dd0bf043da97855c20f5c9316ace34d63fccf2c3e4920fb21a9626240f8f74340ec4eaf34e170ffffe70b12be111e5d17cff47a3257
+MISC metadata.xml 463 BLAKE2B 90b3702d7d29524a2f0c450d757fa35178211816fbf04661251a257d681d0af7ca7020f920e51fb1ae380fa24c5dd473588ae8ea42f1eb4982246c903872becd SHA512 ea4d26003fa929bc21a5678633a8df6cf76a6ce4dc4a6c33c15207e41fd147e94e2632dfcf3c1bfd46467920d8c46a667ec83fe71caa1347a5da2b798dffc329
diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml
index 0ec067e3c855..256972b598b3 100644
--- a/net-nntp/sabnzbd/metadata.xml
+++ b/net-nntp/sabnzbd/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="7za">Add support for extracting 7za files</flag>
-		<flag name="rar">Add support for extracting rar files</flag>
-		<flag name="unzip">Add support for extracting zip files</flag>
-	</use>
 	<maintainer type="person" proxied="yes">
 		<email>joe@wt.gd</email>
 		<name>Joe Kappus</name>
diff --git a/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild
deleted file mode 100644
index 0380a2df95fc..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit 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"
-
-# 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="+7za +rar unzip"
-
-# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
-# be in python's sitedir.  See: https://sabnzbd.org/wiki/advanced/unix-packaging
-
-COMMON_DEPS="
-	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.2[${PYTHON_USEDEP}]
-	')
-"
-
-DEPEND="${COMMON_DEPS}"
-
-RDEPEND="
-	${COMMON_DEPS}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-	7za? ( app-arch/p7zip )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MY_HOMEDIR="/var/lib/${PN}"
-	python-single-r1_pkg_setup
-}
-
-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: ${MY_HOMEDIR}"
-		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."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 3; then
-				ewarn
-				ewarn "Due to changes in this release, the queue will be converted when ${PN}"
-				ewarn "is started for the first time. Job order, settings and data will be"
-				ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
-				ewarn "fetching before the upgrade will be lost!"
-				ewarn
-				break
-			fi
-		done
-	fi
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild
deleted file mode 100644
index 614de09e30cd..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..10} )
-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.3[${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/tavalidate[${PYTHON_USEDEP}]
-			dev-python/tavern[${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_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.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.0.ebuild
deleted file mode 100644
index a421ba546d4e..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.7.0.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/tavalidate[${PYTHON_USEDEP}]
-			dev-python/tavern[${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'
-		# 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.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
index a421ba546d4e..47090e19ad47 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
@@ -21,7 +21,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}"
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index c37c52694f79..abe4ff71fb77 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -3,5 +3,5 @@ AUX tin-2.6.2-gnutls.patch 653 BLAKE2B fd5ad80b1f2e5c5307e28e513f2aaf9cbd17f1251
 DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
 DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
 EBUILD tin-2.6.1-r1.ebuild 2025 BLAKE2B 11841532f22a5b6c56c0e5261d24c501ec46f76edc062155d2385e63cc2052e369bae4c3d697e4c0811a63d84b693a112b5ce038e40520398a741c388421a388 SHA512 5cf5e4b1249df5eed6f124499aa3cb56623a5ec2b00e971fff58f4c44fcf91c737718618c56df5eef5923cf552c3fc8f5330af21792698aa526be9f1a2623fde
-EBUILD tin-2.6.2.ebuild 2616 BLAKE2B 1a413554c21c265ff5788cbc803a8d93c1dbabfd5bb80bcce80b8bff9225c63a5382c8a47ec6793065af57ae3de2dafb0520325a6e47c6acce00ef999dd906b9 SHA512 7200bc8e81eaa2414274db129b0d873601d92dd5c476462f5e61efe508660ace7a1b1f0b824119733d2d43a4578902825f61d19cdab50cd58b8151015fcd3d18
-MISC metadata.xml 702 BLAKE2B e49603687a5cf71915d5228e4ecb37b2d14adaebdc7e77d6ccde3fead607e40a722e72423712d38194e14af5e4e429598c1bd7e52242688c6f746a983bc4d7f2 SHA512 cb7e2a8b53bdbb06270daf300fac3af347bdfa40049966e75b7e18db4157569dafc50a1c5abb3367a0103718c26e703b3245b5076686df81ec9727338ce42491
+EBUILD tin-2.6.2-r1.ebuild 2546 BLAKE2B 9c46b165c35e7f9df94b503a81a27b3b0f651d1f27060232f1fb4953b5c3e5ec1de423814d18d44d7df150a415a97122ee220f4caf4de8563277164583cbd3ce SHA512 e5e621ccb31270d2d287cfe19f74f6112fd1bf5df96f63f40e8b9ca07538715177078589787b019ced4c554be5c973a828f24c42ed109b5ea06bb015e7b0c29a
+MISC metadata.xml 567 BLAKE2B 25916692a1170d644125e756c5165c39ae91c663bcb2cb6eee21e6aca3852acb4eedc7ac6b3efdd1506a474c3e3314496018e84c99e218d1e9a92d4bbe6c2b99 SHA512 eabaa6400110777a838ece4787f6978eb2c4dd1bdf4051e498190e0607550ad8bf18ac63fd946635d2ea19849ea015a383da9bed35cfc940a2cae9b7f1329c61
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 2273dcd0ef5a..99b4b39ce6a7 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -9,6 +9,5 @@
 		<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
 		<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
 		<flag name="libtls" restrict="&gt;=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
-		<flag name="pcre2" restrict="&gt;=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-nntp/tin/tin-2.6.2.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild
index 50345f36be9e..b5e39382f92c 100644
--- a/net-nntp/tin/tin-2.6.2.ebuild
+++ b/net-nntp/tin/tin-2.6.2-r1.ebuild
@@ -12,18 +12,17 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl"
+IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
 
 RDEPEND="
 	dev-libs/icu:=
+	dev-libs/libpcre2:=
 	dev-libs/uulib
 	sys-libs/ncurses:=
 	virtual/libiconv
 	cancel-locks? ( >=net-libs/canlock-3.0:= )
 	gpg? ( app-crypt/gnupg )
 	nls? ( virtual/libintl )
-	pcre2? ( dev-libs/libpcre2:= )
-	!pcre2? ( dev-libs/libpcre:3 )
 	sasl? ( virtual/gsasl )
 	socks5? ( net-proxy/dante )
 	ssl? (
@@ -37,6 +36,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-alternatives/yacc
+	dev-libs/libpcre2
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
@@ -56,9 +56,6 @@ src_configure() {
 		$(use_enable cancel-locks)
 		$(use_with cancel-locks canlock)
 
-		$(use_with pcre2 pcre2-config)
-		$(use_with !pcre2 pcre "${ESYSROOT}"/usr)
-
 		$(use_enable debug)
 		$(use_enable gpg pgp-gpg)
 		$(use_enable nls)
@@ -66,6 +63,8 @@ src_configure() {
 		--disable-mime-strict-charset
 		--enable-nntp
 		--enable-prototypes
+		--without-pcre
+		--with-pcre2-config
 		--with-coffee # easter egg :)
 		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
 		--with-screen=ncursesw