gentoo resync : 15.06.2021

3 files changed, 13 insertions, 161 deletions

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index b4b36b603ce3..f26a3903d69f 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -1,9 +1,8 @@
 AUX nzbget.confd 337 BLAKE2B 4986f3c00019f8f2d0c3d71f9d623186823748722dc4c8aea82ef39b57cebc079247ce5aaa14f1fd844a3c94931f53c1af7ce015e2b4ba68973367c6b708e0e3 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56
 AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3b96c55bcdb115cc99d12e0569f59cc546f9655460230e5f29a82c4d749a654e2019e7c06651c165a SHA512 df4965d25a221c033586da85596584a712bc5c5d9c2e0950850f96fa872f29a04571649e7add504d9fe8be3639654e5653a766a6accf4dea344ca771088b432a
 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
-EBUILD nzbget-20.0.ebuild 3043 BLAKE2B 9d449735a9e61dafb3a55f49ad80be261cdc2012b5380015bd7a62c7d95dcd866593882f3062f4e4a617f5fb28f945bd10d19af080f9c9c6a95167f78ab6dd21 SHA512 11345f3703c2525988ab68d83178b08b699b682a6310519859d6471ee5258ad8c3f22557c3cc77f418a65655e7968b9464b554e186ba3d4a70afafcda594c638
+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.0.ebuild 3101 BLAKE2B 91d47f889ae37f05225f0f505d8e91f71a500865d15b6079a7e35dcff911b4a13176a0973d11004e89626e5e869db6027f563df238e31b184726f097df9b689c SHA512 aa949435cb74bfd30470fc843a25310cd81fee44b1bed95b94aeacd3d5b82e83bf0eeced72f8109ad563fe7aa5847f0cddc3b5554f5d65f2198a537afbab2855
+EBUILD nzbget-21.1.ebuild 2446 BLAKE2B cafdb0087ea743902cd9c0a3b3ece9ab67674ab3ffdc7e46a37a9ba76a88131e6ea6dddaa36222d54b1786159141203014d0b1ecdcd3911b3f2dbca274b1216c SHA512 967e49df72b173468ac95cea75dae4c9752d9a033e44c04c2e987e5d8d2aff41a79eeccc90186314b4bc635a037f9c5b9dd61b39bfc0eef11d86abe0af315bf8
 MISC metadata.xml 630 BLAKE2B 8e38136bb9cccea932e20e4ec13854a53791d6ffa06524ed4518989fac43acbf22f7c6a55129e43619a4191cf87520239f314e0dabbf0b388fc8a1d01774bd26 SHA512 43a2e999f0b7dc9c4aceb3371787ad715bad79e62c3af24a92e1413043c7860b3e3d671de465c74c73594eeff54d6b91f54925e201f3c23c1a0a82610144772b
diff --git a/net-nntp/nzbget/nzbget-20.0.ebuild b/net-nntp/nzbget/nzbget-20.0.ebuild
deleted file mode 100644
index 487dcba041f5..000000000000
--- a/net-nntp/nzbget/nzbget-20.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic user
-
-MY_PV=${PV/_pre/-r}
-MY_P=${PN}-${PV/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
-HOMEPAGE="https://nzbget.net/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
-IUSE="debug gnutls ncurses +parcheck ssl test zlib"
-RESTRICT="!test? ( test )"
-
-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:= )"
-DEPEND="${RDEPEND}
-	test? (
-		|| (
-			app-arch/rar
-			app-arch/unrar
-		)
-	)
-	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
-
-	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
-
-	sed \
-		-e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
-		-e 's:^LogFile=.*:LogFile=/var/log/nzbget/nzbget.log:' \
-		-e 's:^WebDir=.*:WebDir=/usr/share/nzbget/webui:' \
-		-e 's:^ConfigTemplate=.*:ConfigTemplate=/usr/share/nzbget/nzbget.conf:' \
-		-e 's:^DaemonUsername=.*:DaemonUsername=nzbget:' \
-		nzbget.conf > nzbgetd.conf || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable ncurses curses)
-		$(use_enable parcheck)
-		$(use_enable ssl tls)
-		$(use_enable zlib gzip)
-		$(use_enable test tests)
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-	)
-	econf "${myconf[@]}"
-}
-
-src_test() {
-	./nzbget --tests || die "Tests failed"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	doins nzbget.conf
-	doins nzbgetd.conf
-
-	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
-	keepdir /var/log/nzbget
-
-	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
-	newconfd "${FILESDIR}"/nzbget.confd nzbget
-}
-
-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
-
-	fowners nzbget:nzbget /etc/nzbgetd.conf
-	fperms 640 /etc/nzbgetd.conf
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog
-		elog "Please add users that you want to be able to use the system-wide"
-		elog "nzbget daemon to the nzbget group. To access the daemon run nzbget"
-		elog "with the --configfile /etc/nzbgetd.conf option."
-		elog
-	fi
-}
diff --git a/net-nntp/nzbget/nzbget-21.0.ebuild b/net-nntp/nzbget/nzbget-21.1.ebuild
index 3b9a5af5466d..e1ccd0f93356 100644
--- a/net-nntp/nzbget/nzbget-21.0.ebuild
+++ b/net-nntp/nzbget/nzbget-21.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools 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
 			app-arch/unrar
 		)
 	)
-	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