gentoo resync : 25.08.2020

10 files changed, 126 insertions, 330 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 9d833b7346d1..f22a349a478b 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index ff2317d4696b..4b9ae455d633 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,14 +1,9 @@
-AUX patches/0001-use-system-configobj.patch 784 BLAKE2B df8648aa357f43edd599c91ceb05d068109362c407b7e130abcbbc1d8acfc99a57c0dfda5dea8daa75bbd712b0fd08faec6617fdb8a95df46e9cca29bdc8c1e3 SHA512 3d657a62da5f53eb26bbffe47ddf8c36026f1f6536bfae6c8278ec84f27e1672e058a87bc77e65e1ab40deb8b7c3ee7a72dbcc9035d62af71d7e0642dd7f6542
-AUX patches/0002-use-system-feedparser.patch 929 BLAKE2B c9d9253b6041bdcc87fcca7cdf43dfb4efea925149a67b5a02e63488fc2debcb7b04749a6e4dce1359a5e16b8b91f59df120c5dffe5340bed28503c6f1160c8d SHA512 2a58fc9c21e81c0b18f30bf94ba75777724ec8d0a9d54fddc591f1517c7f92f5b2d3d6726c90ee545f94242fef48020b81ce6291c15f9e8eecc7095f388701db
-AUX patches/0003-cfg-disable-NtfOSD-by-default.patch 962 BLAKE2B bfb066a0364aa01d6ffc7df7178c1a0ef266bbb0bdaf7e7d6bf7240dd2347d5c52358712fcdca834fcfbf04922eb6b41842f267a2226af4129f9f6d48b0e825e SHA512 48f157d0c31465424e7951f933bb2f4089c1abce185df8146cb5292a0be636b9e31c2f761aced09666bf12c907a7a33cea2fa4e5ac0853f55f0de9a0e2751fbf
 AUX sabnzbd-r1.ini 322 BLAKE2B a0afea7621d0385f2d5d01f7b9bff2afaa87efdf8b8cbea19953d572a8369e89ff268d1d92fa1625c9bf684199c6211309667c552d63297c4f01bf40f48332f6 SHA512 ef5cbb8fd8bd9a5636cd082a59e0f31d989bafa4a17b4d87ed6c66254f43b05c759bd021e8c1ea5c2ac24e5538e82dc45199f8cacfb25403a882a8e80259c6d9
 AUX sabnzbd-r1.initd 1391 BLAKE2B 1ff6d3dc4f5ece413cf1c0ab104b23c3a4ab451d5cda283327ca781acee88dcbbe22cffc15a725f6f6825a123f0db94fbad017fb7343c05f47ad02a02b68a235 SHA512 c5be8bf0a0053e1a5a6458b7a86c994e636845be2721dc0b14e76ed425ed077274ecbc800724502fa9fa543714470bbede219ec06e7b5dbd310e07c9a14f644c
 AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b314b3a7a12742ae4da5de93d771f3fb11a8c2ff5a7eef8fc1b879c1d85757ce218d9357037a70d6 SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468
-AUX sabnzbd.ini 347 BLAKE2B b3e247bb75d3d3cead9db3bb1f4d7301542619bfadd66619e3c3d0bc815f4841e95dd11b0b14ec6e02d14e4510aed06abd0c9b66e8b0e2a02fde30a6b5678659 SHA512 14df57a0594a671a275e6e5b4f6a704ce2be01507c518f46162d096870da7b04fb636c4e8aedfdb07d3290934941707eda94180e290bdf7eef561b5641497df4
-AUX sabnzbd.initd 1395 BLAKE2B d8663fefa21e3d371c32ecebd1a3958704d39738ce4496c8f977cc411d6c5235aad6c0147f626089a9964c472b15ed4bd2ede0fb35b08260a705190b877ea65a SHA512 0510dc7386ae57493bf614d9b74614f0c2b160981c0f7e5f784a9a336167de7918112ff1a173e3535edd654567ca806b156ee6db819e139dcfea3990bc8252d8
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
-DIST SABnzbd-2.3.9-src.tar.gz 2738773 BLAKE2B fbb765732c0aab6a47a4d4827d21b1b029c6d40c1c6c335692964210dc4c389e94cd1cdca45bfb3fb8c2fa9adc84f33df0fe3d23a0e4f9143a095eec042a5cf0 SHA512 10a39db9ad7f6d441166da97194b7a281aacd1900f7687bca72c6c2b555114bc2bbdaaba51cb9fcec57aa1b782f20609a07528484ad911ffd9f9eabb54a324fa
-DIST SABnzbd-3.0.0RC1-src.tar.gz 2762495 BLAKE2B 5b623e8cc141426459f3d62c3652df41559946a0fd691163428e7b10dfda5518e9701b1a250ed0a7cda6bfda705869ee6a038184ba8f86cfea70d9ea2d09d613 SHA512 00205b1cb4a74455fc48b0ce0579e6849d08b1cedb28ab01f53da8f37bd75268ced201c9e0510ffdf7b51eee6e666e73bec01f537e1ecbdb7f3f6115422b3074
-EBUILD sabnzbd-2.3.9-r1.ebuild 4248 BLAKE2B 400d61005d17bcb42fc0e0cfa4fb0a3f3eba87a7f9efb6538842bad16c2d23db4a312aae46fb2b57a0a41218f42674e6ee139767db4e2e0f42f14c7190f612c8 SHA512 41439600846fec23a3446598761d9f127353ea34efe4858aa2ad54604cc17957cf37f821a6ec544c3f27284b946f9c65cc868170845e9b17f67483850c540762
-EBUILD sabnzbd-3.0.0_rc1.ebuild 3147 BLAKE2B 346837716675e8ec29ad791b75cc0116fd10ae94946a82ca91e33b7a63e266c8f40a78b491935a703d7305f62fa05badc9e0932d5cfdb9601e3aca863eeb2bd6 SHA512 d6b8e37fff0302ba9927fc5ea9a85dd28b1389e41f1fefac139dbe81585618fb5e06ad36a41860ccf18f629c216c70bdc6556b53e74ede7235937ad6533ab2b1
+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
+EBUILD sabnzbd-3.0.0-r1.ebuild 3150 BLAKE2B c97b73ee686979ee0b6babd2f2b41eb14d0d8081e6c3e72a1e58375b98ae0c7ae2ca5959bd8bd46142b572ef46634b1d62dfc2ec651fac37f3194b69727a6cd1 SHA512 65494b97550afae06680fbeb5b13ee0484c61764dc400ef3d43cfd196917b2606e0d987f3edc3fac22c0cfdf54fc4cc46d2307b39b36d6e2e923d3858df9bb09
+EBUILD sabnzbd-3.0.1.ebuild 3150 BLAKE2B c97b73ee686979ee0b6babd2f2b41eb14d0d8081e6c3e72a1e58375b98ae0c7ae2ca5959bd8bd46142b572ef46634b1d62dfc2ec651fac37f3194b69727a6cd1 SHA512 65494b97550afae06680fbeb5b13ee0484c61764dc400ef3d43cfd196917b2606e0d987f3edc3fac22c0cfdf54fc4cc46d2307b39b36d6e2e923d3858df9bb09
 MISC metadata.xml 537 BLAKE2B fe8b15b9a558bf21c550b24851d3ff861e4c4bda01cae83f9d973377f92142bd0cb5d3580f94b72fe7813ed757c9a487389ffb4aebcb5f3f171e0c480d4a6b5c SHA512 2e1c77abc06440c9d0ea08331a073680de2d49059b1aa7cc245b5b0cbe3aa8e1943a96c97b97071cd9296726d7a0f84a4ad428c8aa26314e0733af2793542e33
diff --git a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch b/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
deleted file mode 100644
index 0f89dcd13414..000000000000
--- a/net-nntp/sabnzbd/files/patches/0001-use-system-configobj.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From db9a217dd5a02b5be72d47b7618f877f39cb31bc Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 13 Feb 2017 18:20:39 -0500
-Subject: [PATCH 1/3] use system configobj
-
----
- sabnzbd/config.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sabnzbd/config.py b/sabnzbd/config.py
-index 2f58ffd..04bfaab 100644
---- a/sabnzbd/config.py
-+++ b/sabnzbd/config.py
-@@ -30,9 +30,10 @@ from hashlib import md5
- from urlparse import urlparse
- import sabnzbd.misc
- from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER
--from sabnzbd.utils import configobj
- from sabnzbd.decorators import synchronized
- 
-+import configobj
-+
- CONFIG_LOCK = threading.Lock()
- SAVE_CONFIG_LOCK = threading.Lock()
- 
--- 
-2.13.0
-
diff --git a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch b/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
deleted file mode 100644
index 68e39a975e7e..000000000000
--- a/net-nntp/sabnzbd/files/patches/0002-use-system-feedparser.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b8540c4c71e917623290f3ca8d4091228fab8903 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 13 Feb 2017 18:21:28 -0500
-Subject: [PATCH 2/3] use system feedparser
-
----
- sabnzbd/rss.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sabnzbd/rss.py b/sabnzbd/rss.py
-index 0315fca..18ac828 100644
---- a/sabnzbd/rss.py
-+++ b/sabnzbd/rss.py
-@@ -25,6 +25,8 @@ import time
- import datetime
- import threading
- 
-+import feedparser
-+
- import sabnzbd
- from sabnzbd.constants import RSS_FILE_NAME, DEFAULT_PRIORITY, NORMAL_PRIORITY, DUP_PRIORITY
- from sabnzbd.decorators import synchronized
-@@ -35,8 +37,6 @@ from sabnzbd.misc import cat_convert, wildcard_to_re, cat_to_opts, \
- import sabnzbd.emailer as emailer
- from sabnzbd.encoding import unicoder, xml_name
- 
--import sabnzbd.utils.feedparser as feedparser
--
- __RSS = None  # Global pointer to RSS-scanner instance
- 
- 
--- 
-2.13.0
-
diff --git a/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch b/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch
deleted file mode 100644
index 064d523a1e1e..000000000000
--- a/net-nntp/sabnzbd/files/patches/0003-cfg-disable-NtfOSD-by-default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 459111cb4f6937d58de480cf06743474f5c1dd3d Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Sat, 5 Aug 2017 17:38:03 -0400
-Subject: [PATCH 3/3] cfg: disable NtfOSD by default
-
----
- sabnzbd/cfg.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sabnzbd/cfg.py b/sabnzbd/cfg.py
-index d8867db..59a341c 100644
---- a/sabnzbd/cfg.py
-+++ b/sabnzbd/cfg.py
-@@ -322,7 +322,7 @@ acenter_prio_queue_done = OptionBool('acenter', 'acenter_prio_queue_done', True)
- acenter_prio_other = OptionBool('acenter', 'acenter_prio_other', False)
- 
- # [ntfosd]
--ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', not sabnzbd.WIN32 and not sabnzbd.DARWIN)
-+ntfosd_enable = OptionBool('ntfosd', 'ntfosd_enable', False)
- ntfosd_cats = OptionList('ntfosd', 'ntfosd_cats', ['*'])
- ntfosd_prio_startup = OptionBool('ntfosd', 'ntfosd_prio_startup', True)
- ntfosd_prio_download = OptionBool('ntfosd', 'ntfosd_prio_download', False)
--- 
-2.13.0
-
diff --git a/net-nntp/sabnzbd/files/sabnzbd.ini b/net-nntp/sabnzbd/files/sabnzbd.ini
deleted file mode 100644
index c5ff04854e15..000000000000
--- a/net-nntp/sabnzbd/files/sabnzbd.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-__version__ = 19
-[misc]
-log_dir = /var/log/sabnzbd
-admin_dir = /var/lib/sabnzbd/admin
-cache_dir = /var/lib/sabnzbd/cache
-complete_dir = /var/lib/sabnzbd/complete
-download_dir = /var/lib/sabnzbd/download
-dirscan_dir = /var/lib/sabnzbd/dirscan
-nzb_backup_dir = /var/lib/sabnzbd/backup
-auto_browser = 0
-host = ::
-port = 8080
-[growl]
-growl_enable = 0
diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
deleted file mode 100644
index b3dca9797562..000000000000
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE="/run/sabnzbd/sabnzbd.pid"
-
-depend() {
-	need net
-}
-
-get_var() {
-	grep -P -o -m 1 "(?<=^${1} = ).*" "${SABNZBD_CONFIGFILE}" || echo 0
-}
-
-start() {
-	ebegin "Starting SABnzbd"
-
-	checkpath -q -d -o ${SABNZBD_USER}:${SABNZBD_GROUP} -m 0770 "$(dirname "${PIDFILE}")"
-
-	start-stop-daemon \
-		--quiet \
-		--start \
-		--user ${SABNZBD_USER} \
-		--group ${SABNZBD_GROUP} \
-		--pidfile "${PIDFILE}" \
-		--wait 1000 \
-		--exec /usr/share/sabnzbd/SABnzbd.py \
-		-- \
-		--config-file "${SABNZBD_CONFIGFILE}" \
-		--logging "${SABNZBD_LOGGING}" \
-		--daemon \
-		--pidfile "${PIDFILE}"
-
-	eend $?
-}
-
-stop() {
-	local protocol="http"
-	local host="$(get_var "host")"
-	local port="$(get_var "port")"
-
-	if [ $(get_var "enable_https") -eq 1 ]; then
-		protocol="https"
-		port="$(get_var "https_port")"
-	fi
-
-	case "${host}" in
-		*:*) host="[${host}]" ;;
-	esac
-
-	local url="${protocol}://${host}:${port}/sabnzbd/api?mode=shutdown"
-
-	if [ $(get_var "disable_api_key") -eq 0 ]; then
-		url="${url}&apikey=$(get_var "api_key")"
-	fi
-
-	local signals="TERM/1/KILL/1"
-
-	ebegin "Stopping SABnzbd"
-
-	if [ "$(wget -o /dev/null -t 1 -O - -T 10 "${url}")" = "ok" ]; then
-		signals="NULL/5/${signals}"
-	fi
-
-	start-stop-daemon \
-		--stop \
-		--pidfile "${PIDFILE}" \
-		--retry "${signals}"
-
-	eend $?
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-2.3.9-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-2.3.9-r1.ebuild
deleted file mode 100644
index 725ecf31daf0..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-2.3.9-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Require python-2 with sqlite USE flag
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 user systemd
-
-MY_P="${P/sab/SAB}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${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:  http://wiki.sabnzbd.org/unix-packaging
-
-# TODO:  still bundled but not in portage:
-# kronos, rsslib, ssmtplib, listquote, json-py, msgfmt, happyeyeballs
-# pynewsleecher
-#
-# dev-python/rarfile is bundled as of 2.0.1 because sabnzbd is modifying it
-# https://github.com/sabnzbd/sabnzbd/commit/de6d642b0dc6eaed63199a99d9a1a8b2e3d0018b
-#
-# Also note that cherrypy is still bundled.  It's near impossible to find
-# out where the bundled and heavily patched version came from (pulled from
-# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
-# further.  Upstream is planning on making this easier with 0.8.0.
-# https://github.com/sabnzbd/sabnzbd/issues/47
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/par2cmdline-0.4
-	$(python_gen_cond_dep '
-		>=dev-python/cheetah-2.0.1[${PYTHON_MULTI_USEDEP}]
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		dev-python/feedparser[${PYTHON_MULTI_USEDEP}]
-		dev-python/gntp[${PYTHON_MULTI_USEDEP}]
-		dev-python/pythonutils[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/sabyenc-3.3.1[${PYTHON_MULTI_USEDEP}]
-	')
-	net-misc/wget
-	7za? ( app-arch/p7zip )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-"
-DEPEND="${PYTHON_DEPS}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	HOMEDIR="/var/lib/${PN}"
-	python-single-r1_pkg_setup
-
-	# Create sabnzbd group
-	enewgroup "${PN}"
-	# Create sabnzbd user, put in sabnzbd group
-	enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/patches
-
-	# remove bundled modules
-	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
-	rm -r gntp || die
-	rm licenses/License-{feedparser,configobj,gntp}.txt || die
-
-	eapply_user
-}
-
-src_install() {
-	local d
-
-	for d in cherrypy email icons interfaces locale po sabnzbd tools util; 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}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	diropts -o "${PN}" -g "${PN}"
-	dodir "/etc/${PN}"
-	dodir "/var/log/${PN}"
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	doins "${FILESDIR}/${PN}.ini"
-
-	dodoc {ABOUT,ISSUES,README}.txt licenses/*
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	einfo "Default directory: ${HOMEDIR}"
-	einfo
-	einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-	einfo
-	einfo "    gpasswd -a <user> sabnzbd"
-	einfo
-	einfo "By default, SABnzbd+ will listen on TCP port 8080."
-	einfo
-	einfo "As Growl is not the default notification system on Gentoo, we disable it."
-
-	local replacing
-	local major
-	local minor
-	for replacing in ${REPLACING_VERSIONS}; do
-		major=$(get_major_version ${replacing})
-		minor=$(get_version_component_range 2 ${replacing})
-
-		if [ "${major}" == "1" ]; then
-			ewarn
-			ewarn "Upgrading to ${PN}-2.x.y converts schedule items to a format"
-			ewarn "that is not compatible with earlier ${PN}-1.x.y releases."
-			ewarn
-			break
-		elif [ "${major}" == "2" ] && [ ${minor} -lt 2 ]; 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
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.0-r1.ebuild
index afa365fd3af6..a4942c83c188 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.0.0_rc1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.0.0-r1.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPS="
 		dev-python/cherrypy[${PYTHON_MULTI_USEDEP}]
 		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
 		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
-		dev-python/feedparser[${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}]
diff --git a/net-nntp/sabnzbd/sabnzbd-3.0.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.0.1.ebuild
new file mode 100644
index 000000000000..a4942c83c188
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.0.1.ebuild
@@ -0,0 +1,121 @@
+# 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_{6..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
+}