gentoo resync : 25.11.2020

13 files changed, 309 insertions, 166 deletions

diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 37e9ddf6cdbd..0360b7d2ed39 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index 1c7eaf1010e1..1a714c3f064e 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -3,8 +3,7 @@ AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3
 AUX nzbget.service 466 BLAKE2B 928ff8fd5f48b9190324ccaa98f1215aa35e30eb9959278fe2b9d77f175ee97a28e0efe3ac034ceb2da023c9d7737aa3f803861489284578412559e257700003 SHA512 5a59562580596bc5524086dcb2b2550b242a5f62750fd42a5b2e9ecb786b40107a21fcab7496d0cd396434da7ed3ee5d1046059d94f5f2bcb76ad496862d19e1
 DIST nzbget-20.0.tar.gz 1925665 BLAKE2B 4c4e93bb0fa170b4b6433cbb7d27f3fa67ed033c462711b19e179f42c18dfed044c937e6a7ce4b08a620f4d7af7d3ec9245de16f15d4db8005d3d8dc4f8f46d4 SHA512 8b0fe8ea41b64be9a2f624ef0fa2a8b8987bee412db68a0e8f1b607ce6be7bfd03f60ecc5e49807f4c726e136bc5a355c44559b215fea2bd290c2eb62a0b5927
 DIST nzbget-21.0.tar.gz 1988902 BLAKE2B ee9204a978502562348dc4945e19b084d8d17f566099cfe7e95dac154ffac6d772084c9c070fba0d585cd2229d0a5760b3298ef29eba52d7c75edbc9fe43e310 SHA512 bbee5073a2788a17d78009b7ae0c41473aa4d8424301e7e62b2544dc8993e1e3b6e1026dd9f71af5627293d2113d8637a4a6138eee0a328554df298117dd6bb3
-DIST nzbget-21.0_pre2302.tar.gz 1989357 BLAKE2B bf937b48c8f26e1144d4b09467a29b96984b9d0a777f6e6728a1922b7718dd2f2847ba51a9baf4cca0cebb7add60807f0f285e5dbeca871d99f0cd279fb292a3 SHA512 672f15df910e79ff39090f812a5925d15efb46c9538b7ca193266a159c95e7487fb31ef4780370532bbc9de8478cd927c461dee1f46cd0bf1d294420f796001e
 EBUILD nzbget-20.0.ebuild 3058 BLAKE2B e357bb04b405dd9466c1d24a4a78a24173faa7a859492a8a701ee424bfc4214f0d8b342794288833c69e0abc506e88fac07303a1d3f712ac4beed5ac20806641 SHA512 d04401177bbd7a2ab4ec94a13021bba9b0a4d89be677bf1145d2b1b3d7bc291f6fd8c075031127fee16fe985b25574758a77aa94bc4d28ca11a94e42fe486c07
+EBUILD nzbget-21.0-r1.ebuild 2454 BLAKE2B d7dbb82a88427147dcf310c04920004bdb5d606f200d1403a7c6130abb8cbecfbf0d0bd9bf54d3383d848540d31dcd510466dff1af563a4711f9aa21ae62ac12 SHA512 bc61aec301f4e2f7c9ed57acc8543a6969d81e1302bbe996f6edc9cf5b5cfce37d07576f6ded08d9f696e44337c02b1d44205350cd8564c14a24813579cd76b7
 EBUILD nzbget-21.0.ebuild 3116 BLAKE2B f2ccbf7347647cc84b6431173a050dcdd4895b0d2a7f167db6dc7799304efabafba2793741324b884c662bd67e8a47edf973627a3e4a96fe198058656f3e278a SHA512 1d1489e4aa315e8c05375751b9f7e684973f5a657388b256cab358533a0c93a1320cbf77264202dab44b3da45605c57067de0e13b74c71cbe62f63e43735f877
-EBUILD nzbget-21.0_pre2302.ebuild 3116 BLAKE2B f2ccbf7347647cc84b6431173a050dcdd4895b0d2a7f167db6dc7799304efabafba2793741324b884c662bd67e8a47edf973627a3e4a96fe198058656f3e278a SHA512 1d1489e4aa315e8c05375751b9f7e684973f5a657388b256cab358533a0c93a1320cbf77264202dab44b3da45605c57067de0e13b74c71cbe62f63e43735f877
 MISC metadata.xml 630 BLAKE2B 8e38136bb9cccea932e20e4ec13854a53791d6ffa06524ed4518989fac43acbf22f7c6a55129e43619a4191cf87520239f314e0dabbf0b388fc8a1d01774bd26 SHA512 43a2e999f0b7dc9c4aceb3371787ad715bad79e62c3af24a92e1413043c7860b3e3d671de465c74c73594eeff54d6b91f54925e201f3c23c1a0a82610144772b
diff --git a/net-nntp/nzbget/nzbget-21.0_pre2302.ebuild b/net-nntp/nzbget/nzbget-21.0-r1.ebuild
index 7177629f10b2..4642b73d48bc 100644
--- a/net-nntp/nzbget/nzbget-21.0_pre2302.ebuild
+++ b/net-nntp/nzbget/nzbget-21.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools eutils flag-o-matic user systemd
+inherit autotools systemd
 
 MY_PV=${PV/_pre/-r}
 MY_P=${PN}-${PV/_pre/-testing-r}
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="debug gnutls ncurses +parcheck ssl test zlib"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/libxml2:=
+DEPEND="
+	dev-libs/libxml2:=
 	ncurses? ( sys-libs/ncurses:0= )
 	ssl? (
 		gnutls? (
@@ -28,35 +29,24 @@ RDEPEND="dev-libs/libxml2:=
 		!gnutls? ( dev-libs/openssl:0=[-bindist] )
 	)
 	zlib? ( sys-libs/zlib:= )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	${DEPEND}
+	acct-user/nzbget
+	acct-group/nzbget
+"
+BDEPEND="
 	test? (
 		|| (
 			=app-arch/rar-5*
 			=app-arch/unrar-5*
 		)
 	)
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 DOCS=( ChangeLog README nzbget.conf )
 
 S=${WORKDIR}/${PN}-${PV/_pre*/-testing}
 
-check_compiler() {
-	if [[ ${MERGE_TYPE} != binary ]] && ! test-flag-CXX -std=c++14; then
-		eerror "${P} requires a C++14-capable compiler. Your current compiler"
-		eerror "does not seem to support the -std=c++14 option. Please"
-		eerror "upgrade to gcc-4.9 or an equivalent version supporting C++14."
-		die "The currently active compiler does not support -std=c++14"
-	fi
-}
-
-pkg_pretend() {
-	check_compiler
-}
-
-pkg_setup() {
-	check_compiler
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -96,7 +86,6 @@ src_install() {
 	doins nzbget.conf
 	doins nzbgetd.conf
 
-	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
 	keepdir /var/log/nzbget
 
 	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
@@ -105,13 +94,6 @@ src_install() {
 }
 
 pkg_preinst() {
-	enewgroup nzbget
-	enewuser nzbget -1 -1 /var/lib/nzbget nzbget
-
-	fowners nzbget:nzbget /var/lib/nzbget/{dst,nzb,queue,tmp}
-	fperms 750 /var/lib/nzbget/{queue,tmp}
-	fperms 770 /var/lib/nzbget/{dst,nzb}
-
 	fowners nzbget:nzbget /var/log/nzbget
 	fperms 750 /var/log/nzbget
 
diff --git a/net-nntp/pan/Manifest b/net-nntp/pan/Manifest
index 74004ce8d965..a8179a5fd0cc 100644
--- a/net-nntp/pan/Manifest
+++ b/net-nntp/pan/Manifest
@@ -1,3 +1,5 @@
 DIST pan-0.145.tar.bz2 2307162 BLAKE2B 09535013d8c2fb511b8c79ef185880b69a3f948d0e168b4fb8acc4d3d07d94fb756df171d003b12e1baef3201e2b8be22d583bb9ff551a5ae22f464feaa6f077 SHA512 3dc92d519158ddd480fc43250bf7a3ec67a877e58b0877c02b99f1dfd968bf18c9a20c3d8c4b6acab4132da89b6b91dd2992616ddf46c1c3f9aa0de8f8ee1949
+DIST pan-0.146.tar.bz2 2309326 BLAKE2B 327582ddcf293f4f5dbd15e30b2c604173b4b5a7c249f4d7cc4181d403b0b397257b017a6a0f65f5ad8da369da427b79e7e7de1aaca1a9af8613863380918148 SHA512 6eb2cdf60bb8cc36b53448edd90ccd3d17d7eb9a96958f6d549ee457578d63edfaababd838009be42e2787bdbac64893eb101170a7d394b05b4c4ee095975810
 EBUILD pan-0.145.ebuild 1314 BLAKE2B b269a83b115951d2094e602d14e8350e4c3a5b79f5443fca9fca3ac9582a46fa7c9bcd1b3836c23440fe69c9e3ae20ca7b0efa854282e1a280c42294fde943fa SHA512 3780ae1e828a48654327658e1d5e33a19965976d2a30483acb6142eab514b67e82eb2887d7f79a6142b93ea0f2283850e92b7da7729c3588681ef3681ec4a4a8
+EBUILD pan-0.146.ebuild 1316 BLAKE2B 7ba00275bcd8b737f8c8772b26468416adbbc659b168b7a6f655219217e2f68c3361c7f3eeca2dfaa543224184e839cd29c3e9362570968ab626ee6f8a90f6b4 SHA512 abc833bed4c9530d299255c6a51cc7a3fdf8e9dcb327aafd4e9ef8acfd101afa92faa62ba1c49734bf7726f39a106d9fe6c6ab7a7c1a535fc197a06c7fb92a14
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-nntp/pan/pan-0.146.ebuild b/net-nntp/pan/pan-0.146.ebuild
new file mode 100644
index 000000000000..825f855de582
--- /dev/null
+++ b/net-nntp/pan/pan-0.146.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A newsreader for GNOME"
+HOMEPAGE="http://pan.rebelbase.com/"
+SRC_URI="http://pan.rebelbase.com/download/releases/${PV}/source/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus gnome-keyring libnotify spell ssl"
+
+RDEPEND="
+	>=dev-libs/glib-2.26:2
+	dev-libs/gmime:2.6
+	>=sys-libs/zlib-1.2.0
+	>=x11-libs/gtk+-2.16:2
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.2 )
+	libnotify? ( >=x11-libs/libnotify-0.4.1:0= )
+	spell? (
+		>=app-text/enchant-1.6:0/0
+		>=app-text/gtkspell-2.0.7:2 )
+	ssl? ( >=net-libs/gnutls-3:0= )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# Wait for webkitgtk4 support
+	# gtk3 support is still not ready (follow what Fedora does)
+	# gmime:3.0 support claimed to be experimental still in 0.145, waiting with it until it's not experimental anymore or we work towards removing :2.6
+	gnome2_src_configure \
+		--with-yelp-tools \
+		--without-gtk3 \
+		--without-gmime30 \
+		--without-webkit \
+		$(use_with dbus) \
+		$(use_enable gnome-keyring gkr) \
+		$(use_with spell gtkspell) \
+		$(use_enable libnotify) \
+		$(use_with ssl gnutls)
+}
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 1043fba7d16f..47e13ef0e256 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -5,7 +5,11 @@ AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e
 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 c97b73ee686979ee0b6babd2f2b41eb14d0d8081e6c3e72a1e58375b98ae0c7ae2ca5959bd8bd46142b572ef46634b1d62dfc2ec651fac37f3194b69727a6cd1 SHA512 65494b97550afae06680fbeb5b13ee0484c61764dc400ef3d43cfd196917b2606e0d987f3edc3fac22c0cfdf54fc4cc46d2307b39b36d6e2e923d3858df9bb09
 EBUILD sabnzbd-3.0.1.ebuild 3150 BLAKE2B c97b73ee686979ee0b6babd2f2b41eb14d0d8081e6c3e72a1e58375b98ae0c7ae2ca5959bd8bd46142b572ef46634b1d62dfc2ec651fac37f3194b69727a6cd1 SHA512 65494b97550afae06680fbeb5b13ee0484c61764dc400ef3d43cfd196917b2606e0d987f3edc3fac22c0cfdf54fc4cc46d2307b39b36d6e2e923d3858df9bb09
 EBUILD sabnzbd-3.0.2.ebuild 3131 BLAKE2B b51c1bcfb5228538cb41f0472b52781df10d161a1927db1896b1bf7dc9f82837f06c629c43d7edcde7caf9a32fda7368fef3327dba2d7a1b8dc452ef094b65a1 SHA512 ca0bc3efb057cd791107907bafb7a038eeeb5b170bc41b8bd11ba75ca8af147b58a9720a3ce0b8d509e4670358d0021c1736104ddb3e99de666b9b44b3d5c5bc
+EBUILD sabnzbd-3.1.0.ebuild 3128 BLAKE2B 214c51581230517bcec612b5751e31b70df3807aa55f4e758addaf26f6ef8d059ec41899c3b4a8965a6ce86b908764518e247d5f943d57d32f9d2c525bf75149 SHA512 f72f6e677cd50dd0fdcdbc6faac4e7b56aea967fec906f2cc840949013ac4137e136f7f5b57074e9274f492d9a7755a74bca66848c9ec5adcbe1858595249dc0
+EBUILD sabnzbd-3.1.1.ebuild 3128 BLAKE2B 214c51581230517bcec612b5751e31b70df3807aa55f4e758addaf26f6ef8d059ec41899c3b4a8965a6ce86b908764518e247d5f943d57d32f9d2c525bf75149 SHA512 f72f6e677cd50dd0fdcdbc6faac4e7b56aea967fec906f2cc840949013ac4137e136f7f5b57074e9274f492d9a7755a74bca66848c9ec5adcbe1858595249dc0
 MISC metadata.xml 537 BLAKE2B fe8b15b9a558bf21c550b24851d3ff861e4c4bda01cae83f9d973377f92142bd0cb5d3580f94b72fe7813ed757c9a487389ffb4aebcb5f3f171e0c480d4a6b5c SHA512 2e1c77abc06440c9d0ea08331a073680de2d49059b1aa7cc245b5b0cbe3aa8e1943a96c97b97071cd9296726d7a0f84a4ad428c8aa26314e0733af2793542e33
diff --git a/net-nntp/sabnzbd/sabnzbd-3.1.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.1.0.ebuild
new file mode 100644
index 000000000000..114184f254fb
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.1.0.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-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.1.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.1.1.ebuild
new file mode 100644
index 000000000000..114184f254fb
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-3.1.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-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/sn/Manifest b/net-nntp/sn/Manifest
deleted file mode 100644
index 9ca6e58d6ec2..000000000000
--- a/net-nntp/sn/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX sn-0.3.8-parallel-make.patch 1809 BLAKE2B 5064984e161bd80691e8a5c3ea110e45d2532ed3538f433944a6d0848ee7b7589904b64cea68fc2fa032eea57190e4ec951423674553c7c08bd5484df3051e7a SHA512 18ae60734faaa75711ef942ad0199eb78ee35a7c8d730d01f0324b84d2cd5089d2e318391592d4c064a78536581259032e201e042e5da3c7b9c39e2fba95e252
-AUX sn-0.3.8-qa.patch 325 BLAKE2B cdf6e124d696a12f6eb44042a10ef92907c421a142d14b0a3de9c33e1985941c7d4352bfaa18717eb4b473b100411ad08d97001a7208c274e87516fdc8f30e6b SHA512 c5ca83fc9ff12ffe5eb09db6a4993fa277c35a8c0a88ac8c9d5563cc66b886c34bd6d4694371956546f0b5fcee2bf4fd7992e223e03fcaa4d9e940c9ad58fecf
-DIST sn-0.3.8.tar.bz2 97751 BLAKE2B 735e6c7ee5cf53a7db4f4da3917b1ded5ce8e7dc9835a2b96388b70e070efd032facae138b32092fea1db20906543d7c275d828a1ea7aa60921270309ccb8211 SHA512 1b2270b03a58d2454ca59434d450e164d3c6ea6953f62d02dc5cef02cd8dbb53de0ce8c1bebe7b8a2dd4c087d898025bc4ab61ef3648df9d6a7e0dd92a544b14
-EBUILD sn-0.3.8.ebuild 1118 BLAKE2B 8a98d31cedb3763b8828741a92a25dd1664cd2f170ba2e3c015de76f68893fb060bb0e5030c72ece1ba54ec317184d978cc753d0d1203be73957cfa8938e6fd1 SHA512 424b6cb1b61082a4a79bd985721231652ef62578407c66ec7414dab66de004f9dce1946c042a4fea7db1936d6d244a612d1016a9ea33576855ad7e826b4f256a
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-nntp/sn/files/sn-0.3.8-parallel-make.patch b/net-nntp/sn/files/sn-0.3.8-parallel-make.patch
deleted file mode 100644
index d94e21897781..000000000000
--- a/net-nntp/sn/files/sn-0.3.8-parallel-make.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- sn-0.3.8/Makefile.orig
-+++ sn-0.3.8/Makefile
-@@ -94,39 +94,39 @@
- 	ar rc $@ $^
- 	ranlib $@
- 
--snsplit: snsplit.o sn.a
-+snsplit: snsplit.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--snscan: snscan.o sn.a
-+snscan: snscan.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS) $(ZLIB)
- sncat: snscan
- 	ln -s snscan sncat
- sncancel: snscan
- 	ln -s snscan sncancel
--snprimedb: snprimedb.o sn.a
-+snprimedb: snprimedb.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--sndumpdb: sndumpdb.o sn.a
-+sndumpdb: sndumpdb.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--snntpd: snntpd.o post.o commands.o list.o sn.a
-+snntpd: snntpd.o post.o commands.o list.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS) $(ZLIB)
--snsend: snsend.o sn.a
-+snsend: snsend.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS) $(ZLIB)
- snstore: snsend
- 	ln -s snsend snstore
--snfetch: snfetch.o sn.a
-+snfetch: snfetch.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--snexpire: snexpire.o sn.a
-+snexpire: snexpire.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--snmail: snmail.o sn.a
-+snmail: snmail.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--snget: snget.o get.o sn.a
-+snget: snget.o get.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--sngetd: sngetd.o get.o sn.a
-+sngetd: sngetd.o get.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--snnewgroup: snnewgroup.o sn.a
-+snnewgroup: snnewgroup.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--sndelgroup: sndelgroup.o sn.a
-+sndelgroup: sndelgroup.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
--snlockf: snlockf.o
-+snlockf: snlockf.o sn.a lib/libstuff.a
- 	$(LD) `cat cc-flags` $^ -o $@ $(LIBS)
- 
- %: %.in sed-cmd
diff --git a/net-nntp/sn/files/sn-0.3.8-qa.patch b/net-nntp/sn/files/sn-0.3.8-qa.patch
deleted file mode 100644
index 52a25ebcd83e..000000000000
--- a/net-nntp/sn/files/sn-0.3.8-qa.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- lib/readln.c
-+++ lib/readln.c
-@@ -9,6 +9,7 @@
-  * Get a single line from an fd.
-  */
- 
-+#include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/types.h>
-
---- lib/cmdopen.c
-+++ lib/cmdopen.c
-@@ -6,6 +6,7 @@
-  */
- 
- #include <unistd.h>
-+#include <stdlib.h>
- #include <fcntl.h>
- #include <sys/wait.h>
- 
diff --git a/net-nntp/sn/metadata.xml b/net-nntp/sn/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-nntp/sn/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-nntp/sn/sn-0.3.8.ebuild b/net-nntp/sn/sn-0.3.8.ebuild
deleted file mode 100644
index f02be147be4c..000000000000
--- a/net-nntp/sn/sn-0.3.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Hassle-free Usenet news system for small sites"
-SRC_URI="http://infa.abo.fi/~patrik/sn/files/${P}.tar.bz2"
-HOMEPAGE="http://infa.abo.fi/~patrik/sn/"
-
-KEYWORDS="~amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-qa.patch
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-	sed -i -e 's/-g -Wall -pedantic -O/-Wall -pedantic/' Makefile || die
-}
-
-src_compile() {
-	emake cc-flags
-	echo ${CFLAGS} >>cc-flags
-
-	emake CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" \
-		SNROOT=/var/spool/news \
-		BINDIR=/usr/sbin \
-		MANDIR=/usr/share/man
-}
-
-src_install() {
-	dodir /var/spool/news /usr/sbin /usr/share/man/man8
-	mknod -m 600 "${D}"/var/spool/news/.fifo p
-	emake install \
-		SNROOT="${D}"/var/spool/news \
-		BINDIR="${D}"/usr/sbin \
-		MANDIR="${D}"/usr/share/man
-	dodoc CHANGES FAQ INSTALL* INTERNALS README* THANKS TODO
-	fowners news:news /var/spool/news{,/.fifo}
-}