gentoo resync : 03.03.2021

10 files changed, 6 insertions, 454 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 4666f8e7fbd8..048e09331d07 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 603c386ab687..1b0c5b2d6fde 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -4,6 +4,6 @@ AUX nzbget.service 466 BLAKE2B 928ff8fd5f48b9190324ccaa98f1215aa35e30eb9959278fe
 DIST nzbget-20.0.tar.gz 1925665 BLAKE2B 4c4e93bb0fa170b4b6433cbb7d27f3fa67ed033c462711b19e179f42c18dfed044c937e6a7ce4b08a620f4d7af7d3ec9245de16f15d4db8005d3d8dc4f8f46d4 SHA512 8b0fe8ea41b64be9a2f624ef0fa2a8b8987bee412db68a0e8f1b607ce6be7bfd03f60ecc5e49807f4c726e136bc5a355c44559b215fea2bd290c2eb62a0b5927
 DIST nzbget-21.0.tar.gz 1988902 BLAKE2B ee9204a978502562348dc4945e19b084d8d17f566099cfe7e95dac154ffac6d772084c9c070fba0d585cd2229d0a5760b3298ef29eba52d7c75edbc9fe43e310 SHA512 bbee5073a2788a17d78009b7ae0c41473aa4d8424301e7e62b2544dc8993e1e3b6e1026dd9f71af5627293d2113d8637a4a6138eee0a328554df298117dd6bb3
 EBUILD nzbget-20.0.ebuild 3050 BLAKE2B 3a65a3f46024ea97df02ee098a1abe2dacfe99fc55d88e56c58b35f6d608584a40cffd2f77276c4fb60c7c0cc5a731c9811bce5179e804967ba8d6a1d2af459d SHA512 92346d8dd0f906a29eb2a94c0acacec540b5c71d7d99aecc16100b728ab280f4ba957532e4edbc462c52bccbc8cd337f9553559d4be5a9eb183791b21d2e9fdc
-EBUILD nzbget-21.0-r1.ebuild 2446 BLAKE2B cafdb0087ea743902cd9c0a3b3ece9ab67674ab3ffdc7e46a37a9ba76a88131e6ea6dddaa36222d54b1786159141203014d0b1ecdcd3911b3f2dbca274b1216c SHA512 967e49df72b173468ac95cea75dae4c9752d9a033e44c04c2e987e5d8d2aff41a79eeccc90186314b4bc635a037f9c5b9dd61b39bfc0eef11d86abe0af315bf8
+EBUILD nzbget-21.0-r1.ebuild 2443 BLAKE2B 41577d2ad616bbdb96feb72a225f198af670ce47cbebeb4235faa52f039c0c878cf5311b05424388064127093757479fc53c53dd7678065feb09098550d91a64 SHA512 8ad12962e018b3460d0bf3da96d05821912cad80887729178a11b01265e81eab92262375815514b84e586144cf0c212794eb034940d46adfe46d233f3160a98f
 EBUILD nzbget-21.0.ebuild 3108 BLAKE2B 7b1a3c7d03a8783fe9a42fc098f7fb11ea1ff21eec0c2f0789ea7a60b07adc1af9ea240fe9bb44c0c41c32487de2e9c0e08600d6b7b370343df4d44736bda987 SHA512 0bc378fb324da88e4d78475314725a210bdb1a0b6d72158ae5d271fca9200666c27aa875af03671873e6cd1314043ec7d2bcb3e0f82f8a9535fc73deaac40a7a
 MISC metadata.xml 630 BLAKE2B 8e38136bb9cccea932e20e4ec13854a53791d6ffa06524ed4518989fac43acbf22f7c6a55129e43619a4191cf87520239f314e0dabbf0b388fc8a1d01774bd26 SHA512 43a2e999f0b7dc9c4aceb3371787ad715bad79e62c3af24a92e1413043c7860b3e3d671de465c74c73594eeff54d6b91f54925e201f3c23c1a0a82610144772b
diff --git a/net-nntp/nzbget/nzbget-21.0-r1.ebuild b/net-nntp/nzbget/nzbget-21.0-r1.ebuild
index e1ccd0f93356..86315ed41dd0 100644
--- a/net-nntp/nzbget/nzbget-21.0-r1.ebuild
+++ b/net-nntp/nzbget/nzbget-21.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="debug gnutls ncurses +parcheck ssl test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index d473cb3ab7aa..ba8a2cd7e50e 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,14 +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.0.0-src.tar.gz 2673275 BLAKE2B 418ffd55c395c9d31e80f087c5e8c47e30bd86dbd8783afc173c9c54c6259b0d4607f5377ff3d83673f8e8ba24f46d5ad923a933a415097a7e48739f01039b45 SHA512 70441d76ad2e6cba33b033a85a29815fc50e9c714a275120bc7010e5e0cfb885f7b3d42f497c4ce46123c9bce2d33f778865d9a17878f6fe5811849faa6fe215
-DIST SABnzbd-3.0.1-src.tar.gz 2674117 BLAKE2B 8143e449e70e0d17cc29437ed11a01d2d006f9840eb218d35a72d0da3dfe64d698ea239bbacc11d341b1a82b96e68dd10cff8145b46d41f85d3c3087779695e8 SHA512 0eefff2c9b64ba92b7f550a22aef21a718b603e5aa1f46818d7516e95c446e9edc556d0e2e16d69f9abad1a6f49146dd90331396f4858e8d7a2903890931e8cf
-DIST SABnzbd-3.0.2-src.tar.gz 2687984 BLAKE2B 47719c247a1bf7bf16a3df0a0fea430c0cf335598ad8f34e6c7c8e9bd762afafc9fdda76c542d4327f9608ea8a845effa57090e07c511906bd782bf93373bb9c SHA512 023eb5f6ae31dab177584bff7f087269f50079e283d3d7873fc29d5f3438fdf2d0d0d49c8e4844d2b11e214510e1f7a60e635e0c37ca74b153f9ee2a9dede238
-DIST SABnzbd-3.1.0-src.tar.gz 2735263 BLAKE2B b01f381c79287db2559176af6bd2409947d0c509e8aa48faf6ac614644e66b4090042eeac3d86b82d8d9b4e2bf92f3f360743d88f45db05f0969de189ac91fd5 SHA512 fb8ccbe82aff763847592668e5423f96dae6e0c70e42e2c7a58de1eb99ff552401df9178b4245d3a09968da1550948e382f65ada9341faeccd58f9b98eb4a680
 DIST SABnzbd-3.1.1-src.tar.gz 2735624 BLAKE2B 411963a49468cb0654be2f586790baaf1f0657491f7f1da848afe2d0fa89750cde8dc06c8a748fe6cb120d27a961881befb1100a234a28d7ec211b4435011576 SHA512 4e8debd2a0ef7379789df035f7d929e2b3dbf13d9394dfebb6075d8b877e610d4ef8953e98eeafd6048952738046bb6b9539e85516f8783c5e06bda1470b3c7e
-EBUILD sabnzbd-3.0.0-r1.ebuild 3150 BLAKE2B 18074df0249b9776c2af82680545b6172c3f083719e9831f6619ae05f74d5c75968af5ddd4288925b76f4958c64d9214dcac0fa8919bcef581325ce9e2567693 SHA512 154b4948cbf738860c5982246c6dac9e32f17623ec751734fe16366e1929e943ea11645993d8e1e56d56cbaaf245421995743f7ee4483469080fb662146da53d
-EBUILD sabnzbd-3.0.1.ebuild 3150 BLAKE2B 18074df0249b9776c2af82680545b6172c3f083719e9831f6619ae05f74d5c75968af5ddd4288925b76f4958c64d9214dcac0fa8919bcef581325ce9e2567693 SHA512 154b4948cbf738860c5982246c6dac9e32f17623ec751734fe16366e1929e943ea11645993d8e1e56d56cbaaf245421995743f7ee4483469080fb662146da53d
-EBUILD sabnzbd-3.0.2.ebuild 3131 BLAKE2B e2d6443c203a3a969160fcc562afd184613209bbbb36c0efd5f8cbd5f3597d33c74e8c733239b59b5f8b0db9fb3e15cc0f99383e29f3f75a7a1a4873eb821453 SHA512 6cdb9f897cd986311bb69c6342e7242ddc66d78c3e0a918ee11d1cf43cf25b52fcc827292ed04dc16fd5c158079e0e71d8b03a0454775cd047be319a29ea8652
-EBUILD sabnzbd-3.1.0.ebuild 3128 BLAKE2B a4730858c14abc8c364e6260d586e50c08db5cdf4b0f7ee1a7acad788cf7912299eaf45677375664500e7eff5e810aa13fe234a27a0d29e44998dfbb02b27ff5 SHA512 68487e6b61cf13e639ae424604582ac3c621046634247f7cacec99f7151c5d1f5e38dad0954c29f05c0cf678247094c2abcb60f16b519412a0a55cc96255a9fa
+DIST SABnzbd-3.2.0-src.tar.gz 2774559 BLAKE2B 82e662355f79a9be54b482ac29d1fb7fe7232355df6784ce3c908d6ee3bfe3cf22db1144034319542df5274ddbb1ef563cf67c5a848062a3f6880a45b308d522 SHA512 98797695950ca35098b8b4103216fd9fcb3fa33112cf2e3918033c26ef094a1affd2a2f389aadcc3ef1666cff1b6de91a99a45032b51711870254568ff9f723a
 EBUILD sabnzbd-3.1.1.ebuild 3128 BLAKE2B a4730858c14abc8c364e6260d586e50c08db5cdf4b0f7ee1a7acad788cf7912299eaf45677375664500e7eff5e810aa13fe234a27a0d29e44998dfbb02b27ff5 SHA512 68487e6b61cf13e639ae424604582ac3c621046634247f7cacec99f7151c5d1f5e38dad0954c29f05c0cf678247094c2abcb60f16b519412a0a55cc96255a9fa
+EBUILD sabnzbd-3.2.0.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
 MISC metadata.xml 537 BLAKE2B fe8b15b9a558bf21c550b24851d3ff861e4c4bda01cae83f9d973377f92142bd0cb5d3580f94b72fe7813ed757c9a487389ffb4aebcb5f3f171e0c480d4a6b5c SHA512 2e1c77abc06440c9d0ea08331a073680de2d49059b1aa7cc245b5b0cbe3aa8e1943a96c97b97071cd9296726d7a0f84a4ad428c8aa26314e0733af2793542e33
diff --git a/net-nntp/sabnzbd/sabnzbd-3.0.0-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.0-r1.ebuild
deleted file mode 100644
index 4ddc240f0d88..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 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_{7..8} )
-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_MULTI_USEDEP}]
-		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
-		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		<dev-python/feedparser-6[${PYTHON_MULTI_USEDEP}]
-		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
-		dev-python/portend[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sabyenc-3.3.1[${PYTHON_MULTI_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 {ABOUT,ISSUES}.txt README.mkd licenses/*
-
-	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.0.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.1.ebuild
deleted file mode 100644
index 4ddc240f0d88..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.0.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 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_{7..8} )
-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_MULTI_USEDEP}]
-		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
-		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		<dev-python/feedparser-6[${PYTHON_MULTI_USEDEP}]
-		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
-		dev-python/portend[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sabyenc-3.3.1[${PYTHON_MULTI_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 {ABOUT,ISSUES}.txt README.mkd licenses/*
-
-	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.0.2.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.2.ebuild
deleted file mode 100644
index dc51dbd417a2..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.0.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2020 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_{7..8} )
-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_MULTI_USEDEP}]
-		dev-python/cheetah3[${PYTHON_MULTI_USEDEP}]
-		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		<dev-python/feedparser-6[${PYTHON_MULTI_USEDEP}]
-		dev-python/notify2[${PYTHON_MULTI_USEDEP}]
-		dev-python/portend[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sabyenc-3.3.1[${PYTHON_MULTI_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.1.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.2.0.ebuild
index 1377f8e25f2c..e842f9ed1be0 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.1.0.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.2.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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_{7..8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 systemd
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index 90f517eacbdc..80d7b115de21 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -1,5 +1,3 @@
-DIST tin-2.4.2.tar.xz 1491388 BLAKE2B 16fab433443d5859cc9661790ff837e8f45767e7f45bafc54a8cffc94fd52cb4ee7afb98e579db49c16148b0f521374404a0f26d75a07a24c1c7a1dc5e3a57fe SHA512 70a9957d5bf5af1bb182a3f4e62795cd5862b7282b7fc0c231c3bd02d83950cdbdd502d8a2cc5eae20b29af584e4f794f03378742b47ed93fc5c61ac5bbb01b6
 DIST tin-2.4.5.tar.xz 1559164 BLAKE2B 4efea88c7f76aef91a848c9ed5d82efac640360e41c515015d406e84ed5ce639bbcd17eff29939312ebf83adb8bb84bc7a4f04833cd7cc0781f92b377a0cb31f SHA512 4ec1c4990ce8d9a46204c0064f19c5c2b99848201c37562f8df76de5be84fdd2bcd35cbc3e9f20233f636522e086ac031a5a9cb65bd22a53eda619dcce86adbc
-EBUILD tin-2.4.2.ebuild 1724 BLAKE2B 24f674ddf5f8d634e868fa91cf4dba5821abaa17a57765413fb0c057e844684c782c8280632d807db66193dea0f72df5f58e88a109452fffa09e236622584834 SHA512 12a9ecb8e52ecb9f16f2cc086b74afaa4b962310fbb5d29d23f595d10bbedacb27dbcf3a6459a0eccea608165005fff3b9c090523eeab7c4494035302366d7d7
 EBUILD tin-2.4.5.ebuild 1782 BLAKE2B 489937c5763d4b5ee8c195db0fc1b5953facb1de97da69d9299b710a9ce2cb4af9f5771b4355c92f84d427336123a4a619fbbd40a456bee43945e6b1d3364e78 SHA512 79fca379c005a9daee81411b3ead748971642350c9dbfa47822e80771828d3d1bcaa22593fa4d73aa8a9382be9cc6a8028a734bdfdf38f6e504f159296e35fbc
 MISC metadata.xml 456 BLAKE2B e606f48de760db9a54bc0d98453c04b71070d0eede202c65ab8ab64ad13557d794c24709c141837cb79468eb063ff6ecf17361385145c2294d90c43f585fe81a SHA512 c73827179e20f2487344e28828b999de4ccf1925a09dac5ae2fbdffbf398c3b147db96f6c69c14e8156bdc84c070dda5b7a24109efb57853ec7a8064a16c8bae
diff --git a/net-nntp/tin/tin-2.4.2.ebuild b/net-nntp/tin/tin-2.4.2.ebuild
deleted file mode 100644
index 1d4e391a4e78..000000000000
--- a/net-nntp/tin/tin-2.4.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A threaded NNTP and spool based UseNet newsreader"
-HOMEPAGE="http://www.tin.org/"
-SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug doc +etiquette gpg idn ipv6 mime nls sasl socks5 spell unicode"
-
-RDEPEND="
-	dev-libs/libpcre
-	dev-libs/uulib
-	gpg? ( app-crypt/gnupg )
-	idn? ( net-dns/libidn )
-	mime? ( net-mail/metamail )
-	nls? ( sys-devel/gettext )
-	sasl? ( virtual/gsasl )
-	socks5? ( net-proxy/dante )
-	sys-libs/ncurses:0[unicode?]
-	unicode? ( dev-libs/icu:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local screen="ncurses"
-	use unicode && screen="ncursesw"
-
-	tc-export AR CC RANLIB
-
-	econf \
-		$(use_enable cancel-locks) \
-		$(use_enable debug) \
-		$(use_enable etiquette) \
-		$(use_enable gpg pgp-gpg) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_with mime metamail /usr) \
-		$(use_with socks5 socks) $(use_with socks5) \
-		$(use_with spell ispell /usr) \
-		--disable-mime-strict-charset \
-		--enable-echo \
-		--enable-nntp-only \
-		--enable-prototypes \
-		--with-coffee  \
-		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.org}}" \
-		--with-pcre=/usr \
-		--with-screen=${screen}
-}
-
-#src_compile() {
-#	emake build
-#}
-
-src_install() {
-	default
-
-	# File collision?
-	rm -f "${ED}"/usr/share/man/man5/{mbox,mmdf}.5
-
-	dodoc doc/{CHANGES{,.old},CREDITS,TODO,WHATSNEW}
-	use doc && dodoc doc/{*.sample,*.txt}
-
-	insinto /etc/tin
-	doins doc/tin.defaults
-}