gentoo resync : 25.11.2020

2 files changed, 13 insertions, 32 deletions

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