13 files changed, 40 insertions, 70 deletions
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index d2d13711feac..7eca38d31eba 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/newspost-2.1.1-r3 b/metadata/md5-cache/net-nntp/newspost-2.1.1-r3
index f6e9b2f99393..45ce68ccc0bc 100644
--- a/metadata/md5-cache/net-nntp/newspost-2.1.1-r3
+++ b/metadata/md5-cache/net-nntp/newspost-2.1.1-r3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://newspost.unixcab.org/download/newspost-2.1.1.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=4edb6ef5085cf43612d159335484a923
diff --git a/metadata/md5-cache/net-nntp/nzbget-20.0 b/metadata/md5-cache/net-nntp/nzbget-20.0
deleted file mode 100644
index 1779da2e5f05..000000000000
--- a/metadata/md5-cache/net-nntp/nzbget-20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup test
-DEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= ) test? ( || ( app-arch/rar app-arch/unrar ) ) virtual/pkgconfig
-DESCRIPTION=A command-line based binary newsgrabber supporting .nzb files
-EAPI=7
-HOMEPAGE=https://nzbget.net/
-IUSE=debug gnutls ncurses +parcheck ssl test zlib
-KEYWORDS=amd64 arm ppc x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nzbget/nzbget/releases/download/v20.0/nzbget-20.0-src.tar.gz -> nzbget-20.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c21160cba95593249956e29f0e42ea5f
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.0 b/metadata/md5-cache/net-nntp/nzbget-21.0
deleted file mode 100644
index 7dac1876215f..000000000000
--- a/metadata/md5-cache/net-nntp/nzbget-21.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst preinst prepare pretend setup test
-DEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= ) test? ( || ( app-arch/rar app-arch/unrar ) ) virtual/pkgconfig
-DESCRIPTION=A command-line based binary newsgrabber supporting .nzb files
-EAPI=7
-HOMEPAGE=https://nzbget.net/
-IUSE=debug gnutls ncurses +parcheck ssl test zlib
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.0/nzbget-21.0-src.tar.gz -> nzbget-21.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	26d8ce6329c43cbac965617f1c0627e2	user-info	a2abd4e2f4c3b9b06d64bf1329359a02	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=bb3e4913d71c59cb2a4051d87f718540
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.0-r1 b/metadata/md5-cache/net-nntp/nzbget-21.0-r1
index e8a9606836d1..9a4e6bce517a 100644
--- a/metadata/md5-cache/net-nntp/nzbget-21.0-r1
+++ b/metadata/md5-cache/net-nntp/nzbget-21.0-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.0/nzbget-21.0-src.tar.gz -> nzbget-21.0.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=3cc8672be8bc0ba1160e68f4468bf7b2
diff --git a/metadata/md5-cache/net-nntp/nzbget-21.1 b/metadata/md5-cache/net-nntp/nzbget-21.1
new file mode 100644
index 000000000000..39f7f11a3a5d
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/nzbget-21.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( || ( app-arch/rar app-arch/unrar ) ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst preinst prepare test
+DEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= )
+DESCRIPTION=A command-line based binary newsgrabber supporting .nzb files
+EAPI=7
+HOMEPAGE=https://nzbget.net/
+IUSE=debug gnutls ncurses +parcheck ssl test zlib
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libxml2:= ncurses? ( sys-libs/ncurses:0= ) ssl? ( gnutls? ( net-libs/gnutls:= dev-libs/nettle:= ) !gnutls? ( dev-libs/openssl:0=[-bindist] ) ) zlib? ( sys-libs/zlib:= ) acct-user/nzbget acct-group/nzbget
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nzbget/nzbget/releases/download/v21.1/nzbget-21.1-src.tar.gz -> nzbget-21.1.tar.gz
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8d1392e0dbcaf6417a5ab4e09f5b5c2e
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.1.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.1.1
deleted file mode 100644
index 14df497eef70..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] >=dev-python/feedparser-6[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-4[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] )
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=7
-HOMEPAGE=https://sabnzbd.org/
-IUSE=+7za +rar unzip python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] >=dev-python/feedparser-6[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-4[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) >=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_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.1.1/SABnzbd-3.1.1-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=05c61f7ed08f781cb087d334dc4c875b
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.2.0 b/metadata/md5-cache/net-nntp/sabnzbd-3.2.0
deleted file mode 100644
index febf2687c962..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] >=dev-python/feedparser-6[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-4[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] )
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=7
-HOMEPAGE=https://sabnzbd.org/
-IUSE=+7za +rar unzip python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] >=dev-python/feedparser-6[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-4[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) >=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_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.2.0/SABnzbd-3.2.0-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f9a8c04402d686f3711662192c74cba1
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.2.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.2.1
index 381312fce00d..ad6e6a4a7ce5 100644
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.2.1
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.2.1
@@ -1,15 +1,15 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=install postinst setup
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] >=dev-python/feedparser-6[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-4[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] )
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] )
 DESCRIPTION=Binary newsgrabber with web-interface
 EAPI=7
 HOMEPAGE=https://sabnzbd.org/
-IUSE=+7za +rar unzip python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
+IUSE=+7za +rar unzip python_single_target_python3_8 python_single_target_python3_9
 KEYWORDS=amd64
 LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/cheetah3[python_targets_python3_7(-)] dev-python/cherrypy[python_targets_python3_7(-)] dev-python/configobj[python_targets_python3_7(-)] dev-python/cryptography[python_targets_python3_7(-)] >=dev-python/feedparser-6[python_targets_python3_7(-)] dev-python/notify2[python_targets_python3_7(-)] dev-python/portend[python_targets_python3_7(-)] >=dev-python/sabyenc-4[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) >=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_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) >=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_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.2.1/SABnzbd-3.2.1-src.tar.gz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	d273d56dc725880edbeb1f6389faf5f1	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=92660b36be2bf2bc6e9e4b0a32774637
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.3.0 b/metadata/md5-cache/net-nntp/sabnzbd-3.3.0
new file mode 100644
index 000000000000..8640c39cf106
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=install postinst setup
+DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] )
+DESCRIPTION=Binary newsgrabber with web-interface
+EAPI=7
+HOMEPAGE=https://sabnzbd.org/
+IUSE=+7za +rar unzip python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
+RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/cherrypy[python_targets_python3_8(-)] dev-python/configobj[python_targets_python3_8(-)] dev-python/cryptography[python_targets_python3_8(-)] >=dev-python/feedparser-6[python_targets_python3_8(-)] dev-python/notify2[python_targets_python3_8(-)] dev-python/portend[python_targets_python3_8(-)] >=dev-python/sabyenc-4[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] >=dev-python/sabyenc-4[python_targets_python3_9(-)] ) >=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_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.3.0/SABnzbd-3.3.0-src.tar.gz
+_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	python-single-r1	d25ac9d5d91fe9d44fda6ec192aca11a	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f9a8c04402d686f3711662192c74cba1
diff --git a/metadata/md5-cache/net-nntp/suck-4.3.3-r1 b/metadata/md5-cache/net-nntp/suck-4.3.3-r1
index 09ee3d81079f..9ca222a3c636 100644
--- a/metadata/md5-cache/net-nntp/suck-4.3.3-r1
+++ b/metadata/md5-cache/net-nntp/suck-4.3.3-r1
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=sys-libs/gdbm:= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/lazarus-pkgs/suck/archive/4.3.3.tar.gz -> suck-4.3.3.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=9d57525ac02f890469542697a3c0c809
diff --git a/metadata/md5-cache/net-nntp/suck-4.3.4 b/metadata/md5-cache/net-nntp/suck-4.3.4
index 32df5ee1ed46..11171b9524b0 100644
--- a/metadata/md5-cache/net-nntp/suck-4.3.4
+++ b/metadata/md5-cache/net-nntp/suck-4.3.4
@@ -10,5 +10,5 @@ LICENSE=public-domain
 RDEPEND=sys-libs/gdbm:= ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=https://github.com/lazarus-pkgs/suck/archive/4.3.4.tar.gz -> suck-4.3.4.tar.gz
-_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=autotools	9e63f92c2a5d867fea55ecb160c7d354	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=a004fd668c4510ef5498245ac5df3cb0
diff --git a/metadata/md5-cache/net-nntp/tin-2.4.5 b/metadata/md5-cache/net-nntp/tin-2.4.5
index 3ddcf61c5f8d..75f434813c34 100644
--- a/metadata/md5-cache/net-nntp/tin-2.4.5
+++ b/metadata/md5-cache/net-nntp/tin-2.4.5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/libpcre dev-libs/uulib gpg? ( app-crypt/gnupg ) idn? ( net-dns/libidn ) mime? ( net-mail/metamail ) nls? ( sys-devel/gettext ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) sys-libs/ncurses:0[unicode?] unicode? ( dev-libs/icu:= )
 SLOT=0
 SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.4.5.tar.xz
-_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_eclasses_=multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
 _md5_=d181424bd90f795191ae3c5736f79a8e