gentoo resync : 20.06.2021

6 files changed, 127 insertions, 4 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 10d5b54a9631..08903514e926 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index f26a3903d69f..2ecba142019b 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -3,6 +3,6 @@ AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3
 AUX nzbget.service 466 BLAKE2B 928ff8fd5f48b9190324ccaa98f1215aa35e30eb9959278fe2b9d77f175ee97a28e0efe3ac034ceb2da023c9d7737aa3f803861489284578412559e257700003 SHA512 5a59562580596bc5524086dcb2b2550b242a5f62750fd42a5b2e9ecb786b40107a21fcab7496d0cd396434da7ed3ee5d1046059d94f5f2bcb76ad496862d19e1
 DIST nzbget-21.0.tar.gz 1988902 BLAKE2B ee9204a978502562348dc4945e19b084d8d17f566099cfe7e95dac154ffac6d772084c9c070fba0d585cd2229d0a5760b3298ef29eba52d7c75edbc9fe43e310 SHA512 bbee5073a2788a17d78009b7ae0c41473aa4d8424301e7e62b2544dc8993e1e3b6e1026dd9f71af5627293d2113d8637a4a6138eee0a328554df298117dd6bb3
 DIST nzbget-21.1.tar.gz 1988916 BLAKE2B 74298c5c7f3986831f36832a8ffe596543196b5b46500925de478bf11cab8e66fb36dee9458533a4194d82123765b29e37914463d72fd206e218b4875861001a SHA512 d8dc1ad324f675c5505e623049a14c022475267aa03dcd5d8fd6cf9ed3b776cc2776077b61d035e252937ea4b6bf8f90bd33e715cfd842d2e012615df3ffeafb
-EBUILD nzbget-21.0-r1.ebuild 2442 BLAKE2B 5685c301b2d5c60684ebd76b143facaa0670d7e83bd1746a0658cfe1d855c8faaddaae1bce3dbfbe79938ada213d337c26c4d98cec252541cebf27147451b156 SHA512 4bef2a5e68ac0ef634b3381e5a04e34e32efce24221494ba0d309430b3c120f05205abf15e81ecdec41e5b575a2fe5243fa561fee9caccfd25f1869c36b06292
-EBUILD nzbget-21.1.ebuild 2446 BLAKE2B cafdb0087ea743902cd9c0a3b3ece9ab67674ab3ffdc7e46a37a9ba76a88131e6ea6dddaa36222d54b1786159141203014d0b1ecdcd3911b3f2dbca274b1216c SHA512 967e49df72b173468ac95cea75dae4c9752d9a033e44c04c2e987e5d8d2aff41a79eeccc90186314b4bc635a037f9c5b9dd61b39bfc0eef11d86abe0af315bf8
+EBUILD nzbget-21.0-r2.ebuild 2445 BLAKE2B 996992ae3f64a147a9fe704757e510bce821c13d03491aa79b7ec102ce3ff7b5f19136bb9bfd03090158edeb920587ae7509e9f00c3f881914e0ccca073db454 SHA512 9e1938fb947ff3fd4e28915d60338392c1d372f26f10956a6ea5f45cee933f0f0cce8ab37823915b8d4d9c505a8e005f8199dd7426de447106e097126d1568bb
+EBUILD nzbget-21.1-r1.ebuild 2449 BLAKE2B fa8dd701a1327a14004456eba91345b980ab16353f086df30fcb1388b42bc811e603dd6785e9cdf3904c70f06cb772badc3f9ae64e28fddb49fcb3852ab19aca SHA512 0757393887252c8b77b27a5b2d687cfc25afdc2d247583b609bce708447756c667a2731fb60e536b22de14d1891df067316c0e8d999e9026110419aefbb5b58e
 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-r2.ebuild
index 62f7b5806f41..fa2ce4072770 100644
--- a/net-nntp/nzbget/nzbget-21.0-r1.ebuild
+++ b/net-nntp/nzbget/nzbget-21.0-r2.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 			net-libs/gnutls:=
 			dev-libs/nettle:=
 		)
-		!gnutls? ( dev-libs/openssl:0=[-bindist] )
+		!gnutls? ( dev-libs/openssl:0=[-bindist(-)] )
 	)
 	zlib? ( sys-libs/zlib:= )"
 RDEPEND="
diff --git a/net-nntp/nzbget/nzbget-21.1.ebuild b/net-nntp/nzbget/nzbget-21.1-r1.ebuild
index e1ccd0f93356..098766a689af 100644
--- a/net-nntp/nzbget/nzbget-21.1.ebuild
+++ b/net-nntp/nzbget/nzbget-21.1-r1.ebuild
@@ -26,7 +26,7 @@ DEPEND="
 			net-libs/gnutls:=
 			dev-libs/nettle:=
 		)
-		!gnutls? ( dev-libs/openssl:0=[-bindist] )
+		!gnutls? ( dev-libs/openssl:0=[-bindist(-)] )
 	)
 	zlib? ( sys-libs/zlib:= )"
 RDEPEND="
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 86eb9c95658d..550fa4ca4fb2 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -4,6 +4,8 @@ AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b3
 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 3127 BLAKE2B 9e9c5aadb0d24d229278816683373c3b62599332d49eb4c626ae2ca501b3b9f33b943b4e31bca24631a1e2bc7a284679dee398d30d8789c6094b51d83443e763 SHA512 582cddf425da427b41a3e4b1c0a9563395325892bacaa11153db4390e07fe50508a3f4a1fec89f2253098bf3a6cfb29dac1733dcf966ebc3ed28b5a2a2dbfe6b
 EBUILD sabnzbd-3.3.0.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
+EBUILD sabnzbd-3.3.1.ebuild 3128 BLAKE2B 2d7ffde57ce1197a502330f4623c5a2113ab4ecad73f6e898e6ad8409c78ab99f362bf9d3896c9b0d73bbffb437cbbe899c75252093e116f70230467da9dd634 SHA512 5915a43ccfb1621004c8b2478d7d97349902872f51b6cb82b5ecd333614e97151899b141772429bad4edc01c417c90afc19006b1ee72d1e104e1cc3b42cc1731
 MISC metadata.xml 537 BLAKE2B 7e120368e0f02298c0b0760d0574156d970807b43e78b7faa85d84a69fa5c9d97f12929865c9446f8de5a2f50b3a034e57925f9420b48ee85cf48a949ec78328 SHA512 9006b64233c7bc73f34f3aaa70d9de7c7eda5375017ac892169d100d2b0f931695f723644235203b04fe4cd6da5dc74ca247c62f217307a4224b81bc005cb753
diff --git a/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
new file mode 100644
index 000000000000..e842f9ed1be0
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.3.1.ebuild
@@ -0,0 +1,121 @@
+# 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..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_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
+}