From b89a664f266dab3b9b5ddac2cb874f8869142370 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 13 Oct 2022 01:41:21 +0100
Subject: gentoo auto-resync : 13:10:2022 - 01:41:21

---
 net-nntp/Manifest.gz                     | Bin 1538 -> 1540 bytes
 net-nntp/sabnzbd/Manifest                |  10 +-
 net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild    | 121 ------------------------
 net-nntp/sabnzbd/sabnzbd-3.4.1-r1.ebuild | 123 -------------------------
 net-nntp/sabnzbd/sabnzbd-3.4.2.ebuild    | 123 -------------------------
 net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild | 122 +++++++++++++++++++++++++
 net-nntp/sabnzbd/sabnzbd-3.6.0.ebuild    | 122 -------------------------
 net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild | 152 +++++++++++++++++++++++++++++++
 8 files changed, 277 insertions(+), 496 deletions(-)
 delete mode 100644 net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
 delete mode 100644 net-nntp/sabnzbd/sabnzbd-3.4.1-r1.ebuild
 delete mode 100644 net-nntp/sabnzbd/sabnzbd-3.4.2.ebuild
 create mode 100644 net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild
 delete mode 100644 net-nntp/sabnzbd/sabnzbd-3.6.0.ebuild
 create mode 100644 net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild

(limited to 'net-nntp')

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 4f2518dd9dd7..a8af9d860d4b 100644
Binary files a/net-nntp/Manifest.gz and b/net-nntp/Manifest.gz differ
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 0313b1521f37..812a55830f28 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,12 +2,8 @@ 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.3.1-src.tar.gz 2786705 BLAKE2B 1ce58c2fd51304395402e2ad4379556e9f1a1471d524d1b3b969b9b201edf15dece1f12d9891695e9dbb02664014c2540ed9fce02b4418fc3100cd3bb2717983 SHA512 0ab7001935f19c8e1829051949965977b895456b83ee26b6379fd9c7024d114d5bdd0701d747c8935bb46a829d46379e4406012007a9039c43fb99e4db3ee920
-DIST SABnzbd-3.4.1-src.tar.gz 2978066 BLAKE2B d7fc9df71ccf0ee8d9282fb7ec7a088e5f9d4cf99f07d120a1e89ae18f1f3c5e34bd4717bdb79dd097f219021e10c56150b95faf6a43bc896060c1249f63dcaf SHA512 befc5d26860702d0a0b945e0fde35244869e2a766ae6819aafd642bad0897ff439830b5c72f914c139c3f8bfad7fccd9bced9bced8db6349a341f9c3be302fe8
-DIST SABnzbd-3.4.2-src.tar.gz 2979084 BLAKE2B 2e75212226221c283e46533c46dd6eb3f880d636d73d8e3620650068d9ad67f3f1f55a9a418cdc74876f7e12a37c94a3dbcd79112f46fd322301d93bfbdf9063 SHA512 d34a59540c9bb371de912dd0501b3e6dfa392da4d833cfcaf3b550bd11342439a2b64b2205207cd0d0a9c3947cdd1b43ca90d41b130d21e28cede5bf362fd5ae
 DIST SABnzbd-3.6.0-src.tar.gz 5052873 BLAKE2B 41b6fb818e9bcf40bedd16e9b2a0d5b2590cdbef8a29187f0e995d11d036c60364ed6f297eb6c2bb3f257040ef66b9bd26bc8464b9af2adfac3922f4817918a6 SHA512 277953a10211b72532ef4c490cc77516ad4691e15f55bbc08572edba8fc4154ddde5d6bd62ea79c2279dad571038cab25194d6764bf1377dda25d522a5838a92
-EBUILD sabnzbd-3.3.1.ebuild 3073 BLAKE2B 6f85938c8574ce35c310e9689a1e7e6e9fa0e1361a37ff0870be146c0e6a870452f6ff54af8f3e08e06efe871009f95b38835b861ed0ec3df6f6ca0ab371ad62 SHA512 997ea6ae8ae26dbb88e02360ee87352b1f3afa0f5b1b27be156f036ca7ae4b510565190c99cbfdea2ac2bb514e34837c6e0242cd1185c93c03741c1ce798101a
-EBUILD sabnzbd-3.4.1-r1.ebuild 3163 BLAKE2B aae8176e1e6db9708af9379681afe1519ea5354dd6f14bae87fdf5fcde13e663cccb3e021efb2799bb70e7297250cb59039c63d2deb08e947a790f6ce45e57f1 SHA512 e653642dd76bbfb4682a15cfcb5612213584e58583a969c010194c594604c410f27e96edab80ec85757b1c901bb6189ebdcbce9a48e9edfc4040f5818d5952dd
-EBUILD sabnzbd-3.4.2.ebuild 3162 BLAKE2B 6b3a7497b696bd600e06f3c2f174655ffb2aee1dc26d20c9dc007f5c1034466616f603cddcc15028488d8d3c2e651c634e72cdc83d2ce43ae6f2568f863457e3 SHA512 d7c11f3fb01f21f2a136a23ddc092c32d9fc26e7ab88c7b2fc3780cc17f082a498bde36fb15903f9bdbc0e44175cb841175d94ea765fff654b1db4a9410bfee9
-EBUILD sabnzbd-3.6.0.ebuild 3132 BLAKE2B e8ac6eef54e23fef576ae963e9804a225dd252fe2e96a41682e29bd36e788fe091c3b28c7017c61f43bc280b1bffa9868244c3f82b914b95c11153cfca2c1bf1 SHA512 75b2b3d160156d7023ec9e945103977bbd3b80896e727848edba0c45f55293b0c5a266a60a85980a20024bf8620b8f2c327dc57d3f352b7803192d0dffca7620
+DIST SABnzbd-3.6.1-src.tar.gz 5051796 BLAKE2B a123b148290dd135f2eb375ce712b19b241907fd78935d9ec8cbb1b80b695c0aa0f92aff6b533e1966c84b9024f4c154a9708496331f85111906e6b068c22410 SHA512 7864f9252bbe8d66cd307e78911b03973554f1a2ccbba0e5ede536e4b7c679fe48cc1e334209688a9f9cd289b8bafc9a317dd02c6563e4151eba4fe2d81b9ddc
+EBUILD sabnzbd-3.6.0-r1.ebuild 3130 BLAKE2B ba677066233f646ae75c7496c17bbc690065c8fb189b194c1e04bdbc99ded585f4c9735ff5023087a0a7a9d99445f6593a6f1ae4a7ec06734aaa262d28b4382f SHA512 ea48dbe90c33ba7e88ee00af640507a9face238cd9097bba9ceb12dad3bf7e3087057a0bca8c96efed353f735dcb957f444cbcc7dd95efe9b808f127aed2a117
+EBUILD sabnzbd-3.6.1-r1.ebuild 4709 BLAKE2B a209c740d16bf0278739b0bd5b9bffefc3847a7c0a4fd50a8367dbb29f3f76523686fd61867d741efc7717b015fdc6a1cba5a56e9018f53afd935e0fe5aea406 SHA512 2fe9932fe6a9de9b245dd989b20a6c379afd62232630de62f1572929d7f1bb87476abcd9cf4fd9b8dc1da3c9928ef9eaed662779e160e1415015d136969c01f2
 MISC metadata.xml 454 BLAKE2B 6de73a354f3530085dcf2bab7c4c49df78e265bc52a9cb3c68877e9b8723bfecacc40f14231c53d7d9aaf493c3a4a459cd7761eebdea2865a17d87ea8d6625e5 SHA512 2493b2eddd9c6b13856caab20af0c1db835573148c969c6e06abbdc421d1f0fa8b03eb5ec200cf8352363f7af59a89cdaf297673b33d84e23aa59b71a93417ed
diff --git a/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
deleted file mode 100644
index 62d937efe4f5..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{8..9} )
-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[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		>=dev-python/sabyenc-4[${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.4.1-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.4.1-r1.ebuild
deleted file mode 100644
index f491417916f3..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.4.1-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-# Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{8..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[${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-4[${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.4.2.ebuild b/net-nntp/sabnzbd/sabnzbd-3.4.2.ebuild
deleted file mode 100644
index dea1a60baa00..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.4.2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-# Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{8..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[${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-4[${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.0-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild
new file mode 100644
index 000000000000..22daee2ef0f5
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..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.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.6.0.ebuild
deleted file mode 100644
index ba2ec5410139..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.6.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{8..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
new file mode 100644
index 000000000000..da5cea42adb9
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PYTHON_COMPAT=( python3_{8..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}]
+		')
+		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
+}
-- 
cgit v1.2.3