gentoo resync : 15.06.2021

3 files changed, 2 insertions, 125 deletions

diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 97e3c0055195..86eb9c95658d 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,10 +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.1.1-src.tar.gz 2735624 BLAKE2B 411963a49468cb0654be2f586790baaf1f0657491f7f1da848afe2d0fa89750cde8dc06c8a748fe6cb120d27a961881befb1100a234a28d7ec211b4435011576 SHA512 4e8debd2a0ef7379789df035f7d929e2b3dbf13d9394dfebb6075d8b877e610d4ef8953e98eeafd6048952738046bb6b9539e85516f8783c5e06bda1470b3c7e
-DIST SABnzbd-3.2.0-src.tar.gz 2774559 BLAKE2B 82e662355f79a9be54b482ac29d1fb7fe7232355df6784ce3c908d6ee3bfe3cf22db1144034319542df5274ddbb1ef563cf67c5a848062a3f6880a45b308d522 SHA512 98797695950ca35098b8b4103216fd9fcb3fa33112cf2e3918033c26ef094a1affd2a2f389aadcc3ef1666cff1b6de91a99a45032b51711870254568ff9f723a
 DIST SABnzbd-3.2.1-src.tar.gz 2777984 BLAKE2B 6e0ebe122a01f8cbd5b26eefe3728478dd348b3d11fb274c2a146b7567f306074ddd93b438463471e22fc77c6c2223e864c6019ba0d7ab464162451e9f9c8cb9 SHA512 ace29199eb6f03450d25fc3b79960d1afc336f0013771bcf698e7df5c5e5ed920ad783f542ba8f3dbcd451d279993a6d4299d78075184e43ad74411ac19c3f59
-EBUILD sabnzbd-3.1.1.ebuild 3128 BLAKE2B a4730858c14abc8c364e6260d586e50c08db5cdf4b0f7ee1a7acad788cf7912299eaf45677375664500e7eff5e810aa13fe234a27a0d29e44998dfbb02b27ff5 SHA512 68487e6b61cf13e639ae424604582ac3c621046634247f7cacec99f7151c5d1f5e38dad0954c29f05c0cf678247094c2abcb60f16b519412a0a55cc96255a9fa
-EBUILD sabnzbd-3.2.0.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
+DIST SABnzbd-3.3.0-src.tar.gz 2786354 BLAKE2B aa5034d99b570c6ae643209663b2b292d0dcc06dabcb09bb9b28e7b38248b88c98736ae35cff7c6e4c93d2d6a44b716dbf2fd8c7cf71f0b5a65ef0c625d9d00e SHA512 eefc20c9f6921a1efc8f7cafc6f544949dccacacfa01aff29a32355431f8d62d9f4f36312271987b10ff96e9b5f8c6bef390f594282ce42b743faa556489e7fa
 EBUILD sabnzbd-3.2.1.ebuild 3127 BLAKE2B 9e9c5aadb0d24d229278816683373c3b62599332d49eb4c626ae2ca501b3b9f33b943b4e31bca24631a1e2bc7a284679dee398d30d8789c6094b51d83443e763 SHA512 582cddf425da427b41a3e4b1c0a9563395325892bacaa11153db4390e07fe50508a3f4a1fec89f2253098bf3a6cfb29dac1733dcf966ebc3ed28b5a2a2dbfe6b
+EBUILD sabnzbd-3.3.0.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
 MISC metadata.xml 537 BLAKE2B 7e120368e0f02298c0b0760d0574156d970807b43e78b7faa85d84a69fa5c9d97f12929865c9446f8de5a2f50b3a034e57925f9420b48ee85cf48a949ec78328 SHA512 9006b64233c7bc73f34f3aaa70d9de7c7eda5375017ac892169d100d2b0f931695f723644235203b04fe4cd6da5dc74ca247c62f217307a4224b81bc005cb753
diff --git a/net-nntp/sabnzbd/sabnzbd-3.1.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.1.1.ebuild
deleted file mode 100644
index 1377f8e25f2c..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.1.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-4[${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.2.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild
index e842f9ed1be0..e842f9ed1be0 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.2.0.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild