gentoo resync : 25.09.2021

5 files changed, 7 insertions, 129 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 430f35068b60..c6b3c2f2b748 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index fc2b37cdd919..ba59f8b86492 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.2.1-src.tar.gz 2777984 BLAKE2B 6e0ebe122a01f8cbd5b26eefe3728478dd348b3d11fb274c2a146b7567f306074ddd93b438463471e22fc77c6c2223e864c6019ba0d7ab464162451e9f9c8cb9 SHA512 ace29199eb6f03450d25fc3b79960d1afc336f0013771bcf698e7df5c5e5ed920ad783f542ba8f3dbcd451d279993a6d4299d78075184e43ad74411ac19c3f59
-DIST SABnzbd-3.3.0-src.tar.gz 2786354 BLAKE2B aa5034d99b570c6ae643209663b2b292d0dcc06dabcb09bb9b28e7b38248b88c98736ae35cff7c6e4c93d2d6a44b716dbf2fd8c7cf71f0b5a65ef0c625d9d00e SHA512 eefc20c9f6921a1efc8f7cafc6f544949dccacacfa01aff29a32355431f8d62d9f4f36312271987b10ff96e9b5f8c6bef390f594282ce42b743faa556489e7fa
 DIST SABnzbd-3.3.1-src.tar.gz 2786705 BLAKE2B 1ce58c2fd51304395402e2ad4379556e9f1a1471d524d1b3b969b9b201edf15dece1f12d9891695e9dbb02664014c2540ed9fce02b4418fc3100cd3bb2717983 SHA512 0ab7001935f19c8e1829051949965977b895456b83ee26b6379fd9c7024d114d5bdd0701d747c8935bb46a829d46379e4406012007a9039c43fb99e4db3ee920
-EBUILD sabnzbd-3.2.1.ebuild 3073 BLAKE2B 6f85938c8574ce35c310e9689a1e7e6e9fa0e1361a37ff0870be146c0e6a870452f6ff54af8f3e08e06efe871009f95b38835b861ed0ec3df6f6ca0ab371ad62 SHA512 997ea6ae8ae26dbb88e02360ee87352b1f3afa0f5b1b27be156f036ca7ae4b510565190c99cbfdea2ac2bb514e34837c6e0242cd1185c93c03741c1ce798101a
-EBUILD sabnzbd-3.3.0.ebuild 3074 BLAKE2B 872c7c7a66131b4152554786a27891e722df4536ba6c6089304883918fd07bfefef78b0825f4c02048bfa707f6dede18ecbb6cd6ee1c0dbfe534d1a98675c4cb SHA512 9a8bf26731bbfad94d5763009272fd0b7e31275c6c23961c102a40b76441a083ee3c589f3c8ca0859b3f8d6813d4872b21805cb7c5642aa6c2c0404eac07af37
-EBUILD sabnzbd-3.3.1.ebuild 3074 BLAKE2B 872c7c7a66131b4152554786a27891e722df4536ba6c6089304883918fd07bfefef78b0825f4c02048bfa707f6dede18ecbb6cd6ee1c0dbfe534d1a98675c4cb SHA512 9a8bf26731bbfad94d5763009272fd0b7e31275c6c23961c102a40b76441a083ee3c589f3c8ca0859b3f8d6813d4872b21805cb7c5642aa6c2c0404eac07af37
+DIST SABnzbd-3.4.1-src.tar.gz 2978066 BLAKE2B d7fc9df71ccf0ee8d9282fb7ec7a088e5f9d4cf99f07d120a1e89ae18f1f3c5e34bd4717bdb79dd097f219021e10c56150b95faf6a43bc896060c1249f63dcaf SHA512 befc5d26860702d0a0b945e0fde35244869e2a766ae6819aafd642bad0897ff439830b5c72f914c139c3f8bfad7fccd9bced9bced8db6349a341f9c3be302fe8
+EBUILD sabnzbd-3.3.1.ebuild 3073 BLAKE2B 6f85938c8574ce35c310e9689a1e7e6e9fa0e1361a37ff0870be146c0e6a870452f6ff54af8f3e08e06efe871009f95b38835b861ed0ec3df6f6ca0ab371ad62 SHA512 997ea6ae8ae26dbb88e02360ee87352b1f3afa0f5b1b27be156f036ca7ae4b510565190c99cbfdea2ac2bb514e34837c6e0242cd1185c93c03741c1ce798101a
+EBUILD sabnzbd-3.4.1.ebuild 3116 BLAKE2B 5bec9e925789a259006be95cd650ffbddf3b471b9c2aa503ba9600aa94b45a0a4bc587ad19746111542bf849d84479cd0da9cd7cde2849b842aa13453fe6e360 SHA512 0d60ab3f05c657d320d7129e9463bcd3f631a0f31efe708f28a0769caac6c702846ea3a31067b989f4fe6864e16bfd8e426e6d38324319609e2d949a80b2b933
 MISC metadata.xml 538 BLAKE2B ea127a1fc7ca13e6642703a0cdacbc9dc20b341f24906f704a1ad5a501b01fe9a8fe4ec49b965e0f6abd5952c85ccfaf943554cce9d864e23addbc59fdb5b345 SHA512 94f241c468bec52fad72ce3bec6caf926e72d398df3dbcf142818276737b60a4da2669ac100325bec6d4f831f843851e0ab972937ac8bde10176d485efcab712
diff --git a/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.2.1.ebuild
deleted file mode 100644
index 62d937efe4f5..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.2.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.3.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
index b09442235e47..62d937efe4f5 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-s
 # 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="+7za +rar unzip"
 
 # Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
diff --git a/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.4.1.ebuild
index b09442235e47..13de3d3ecc8a 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.3.0.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.4.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 # Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
 inherit python-single-r1 systemd
@@ -40,6 +40,7 @@ COMMON_DEPS="
 		>=dev-python/feedparser-6[${PYTHON_USEDEP}]
 		dev-python/notify2[${PYTHON_USEDEP}]
 		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/puremagic[${PYTHON_USEDEP}]
 		>=dev-python/sabyenc-4[${PYTHON_USEDEP}]
 	')
 "