gentoo resync : 03.11.2018

5 files changed, 35 insertions, 244 deletions

diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index db903a0ac0d4..84c0da1a368b 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -2,12 +2,9 @@ AUX nzbget-14.0_pre1145-tinfo.patch 469 BLAKE2B a12d1e29c7b47f824fcbf6c5cbdd9224
 AUX nzbget.confd 337 BLAKE2B 4986f3c00019f8f2d0c3d71f9d623186823748722dc4c8aea82ef39b57cebc079247ce5aaa14f1fd844a3c94931f53c1af7ce015e2b4ba68973367c6b708e0e3 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56
 AUX nzbget.initd 764 BLAKE2B dfa76fd2040bd226ae0b27839941f377bff91330d41fe27b7e44f26effc42693ead35361a6d0ae293220477c4132dd2ebe44f97390b77772630ce86d981c5a1e SHA512 731e3b2fe4bb9da9927dd15ce8f2358e391746917f3825009b58026a41beda0bb1827e6fb22a3637b7e7e3bee16ea470fef3b3d7f027d48631307f4f818006fc
 AUX nzbget.initd-r1 742 BLAKE2B eef074b7e25cd085b92850892ee8917772451b0f58a7f7c3b96c55bcdb115cc99d12e0569f59cc546f9655460230e5f29a82c4d749a654e2019e7c06651c165a SHA512 df4965d25a221c033586da85596584a712bc5c5d9c2e0950850f96fa872f29a04571649e7add504d9fe8be3639654e5653a766a6accf4dea344ca771088b432a
-DIST nzbget-14.1.tar.gz 1332334 BLAKE2B cbb633993ffd4c7a9cf6556ef833838296bb4d6471e1ef30959244c1373d879176d638874e9892d1ede237ce26e3fe8d0f91f86e3e983f566f2f06a6f8bb9b8c SHA512 fae938529bb3968c0161f63ec3af07f844a8128b61abf6298457a4878ac0d47541d76730c8a068509fa091b102de07c9d28dcd668a8192fcfac60980f69be56d
-DIST nzbget-19.1.tar.gz 1809849 BLAKE2B 30740c22e06f9b794485bb5c0c28cd95f9953863203a9055bf453a9adfe1e58adcf69dcddc3640c13aefb90bb26cd444070af2d9f0f6fadee676af453cdb23c2 SHA512 3ba7cd7f7fec28e29129be0a1ca5879a0593bc54be49e3776e84eeb7804377eec47106aa2371b31dec7d9152301d68b199ce9e66db714195defc8e15ef636532
+AUX nzbget.service 466 BLAKE2B 928ff8fd5f48b9190324ccaa98f1215aa35e30eb9959278fe2b9d77f175ee97a28e0efe3ac034ceb2da023c9d7737aa3f803861489284578412559e257700003 SHA512 5a59562580596bc5524086dcb2b2550b242a5f62750fd42a5b2e9ecb786b40107a21fcab7496d0cd396434da7ed3ee5d1046059d94f5f2bcb76ad496862d19e1
 DIST nzbget-20.0.tar.gz 1925665 BLAKE2B 4c4e93bb0fa170b4b6433cbb7d27f3fa67ed033c462711b19e179f42c18dfed044c937e6a7ce4b08a620f4d7af7d3ec9245de16f15d4db8005d3d8dc4f8f46d4 SHA512 8b0fe8ea41b64be9a2f624ef0fa2a8b8987bee412db68a0e8f1b607ce6be7bfd03f60ecc5e49807f4c726e136bc5a355c44559b215fea2bd290c2eb62a0b5927
-DIST nzbget-20.0_pre2176.tar.gz 1923841 BLAKE2B ba6ba301013b160f4dcaf21257dc2c1ceac3c64c645bde556ed45e8dca5011b8d9b9ce76fbaf42b78f6400b530c4c0baa94ad34fe09daa86619506dd76333ca2 SHA512 7be68999cc284a53100c0892f7558e3e1d2ac7d83019c933ae0596de56a8c9bec78571aaf34983103a30563dcdd6387987f7a13404e0ffac48007e0d44efa525
-EBUILD nzbget-14.1.ebuild 2575 BLAKE2B 2ca47cd82c33c026b36065f40ac656f4483fc234ef7821f20b9612a97f0a6f23c700891494b3659b13e231997f5fa46e18a1e1f0fd729923434d52e695d10db0 SHA512 a263b13e0884c4848a762d4bb739da5e8eae5b7dfac96feb5812fc4f81928d4e600d3cdb9dbf35c407dc81ed1dfa0ce1341bb595f488c4ece75c5feb967660d4
-EBUILD nzbget-19.1.ebuild 2992 BLAKE2B 5359ddbae9897ebc1c657f0a760af6583f15e63ab3599834783975253bafd854255f6ecffbf6d59171ff35b144b5f704df3ae4ee0f4ae2cc87b66292d7755d61 SHA512 a8ad9f64f7520f2e2174124676cd6764ebfa063408e2c45861dbcf49919b5b1b028df4d9db2601a0399cf315637a0b297cac24f54befb878c7a78691e4f658a1
+DIST nzbget-21.0_pre2220.tar.gz 1985190 BLAKE2B e19e1c997615f61895a26ca24ff1eb66e6caf99cecf3f3b0eccc2c0f67ebc61c20cdd24d869d8c2a1d2f0d5c53f5222cc3b151720e3a6d1398507fd252586cf5 SHA512 73cd24628ab224d62b4619ca6b9014edb08ac14f02850def3123db640c785fd8836ba4ee4be40a0cf918ba6c25bf19683e67d05aaa0f96c71ad23b6a30284fa0
 EBUILD nzbget-20.0.ebuild 3034 BLAKE2B 5a33c79601047ab7ef4928a7b8b5b3663a2bfca0bb606bc4f0d36a22067617840207564844c063e75b8ed03e379d4a0ccbf406a95e35462980047d59c1a22f54 SHA512 13d2111e0f51275175d4b854e4934dd784e26749299c3609f8de85565454ee1f966695d2d773d0f53bdbb859301ffd00628dabaefbb2446e6d401ed218d9b324
-EBUILD nzbget-20.0_pre2176.ebuild 3018 BLAKE2B 001272514d21c6e152e2ca363ca5dccc9c8af5c61df266399fedf44a1d91dff48b20466e2c0ca4a16ece3f5f2a7433e33cf945849278913f96f49b266a0cbc93 SHA512 538917bfdf9a27af39496e4046c98d1523ebc93e7b3b8e704c0db9408183e5f8768598b9530c2a35fa2d729c5b5684aab407c3579e8d6da2e73d038741b64d8f
+EBUILD nzbget-21.0_pre2220.ebuild 3089 BLAKE2B 42bf207099fc5e6a0baeffd62fd064fc49a4ecf7fc7b83ea9cf54415204458365c3de924ddef69e81efad2a01b44bc31dce838857cd009996d620aeba1c41944 SHA512 51e15bac64e4bba7925f1f80b61f471c86dacc0d28e91ce92dea7855c7b8db1ec0db115f71c52b0ca403ba78a52f1cfee77e402ced459bb775479f7255d1e670
 MISC metadata.xml 729 BLAKE2B 41b592fbee92ce1e5d10eccc51296732bb8e6ee9aeba2cbf0207c649fc7c0c21ee6a550f01a5023d07fd2c007131641d9ef94275efe2a71e28b759cdc5579dd3 SHA512 93af36b9010a937f80c7c7ed2cf5379437e669c23dfc3e122a3b1699af42f2e9655ea639456e251bd1c04fefd60075543b6a7321e17cba8f82324f556f3f2125
diff --git a/net-nntp/nzbget/files/nzbget.service b/net-nntp/nzbget/files/nzbget.service
new file mode 100644
index 000000000000..031307e3efa4
--- /dev/null
+++ b/net-nntp/nzbget/files/nzbget.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=NZBGet binary newsgrabber
+Documentation=https://nzbget.net/Documentation
+After=network.target
+
+[Service]
+User=nzbget
+Group=nzbget
+Type=forking
+PIDFile=/run/nzbget/nzbget.pid
+RuntimeDirectory=nzbget
+RuntimeDirectoryMode=0755
+ExecStart=/usr/bin/nzbget -c /etc/nzbgetd.conf -o LockFile=/run/nzbget/nzbget.pid -D
+ExecStop=/usr/bin/nzbget -c /etc/nzbgetd.conf -Q
+ExecReload=/usr/bin/nzbget -c /etc/nzbgetd.conf -O
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-nntp/nzbget/nzbget-14.1.ebuild b/net-nntp/nzbget/nzbget-14.1.ebuild
deleted file mode 100644
index 11b50ac963d3..000000000000
--- a/net-nntp/nzbget/nzbget-14.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils user
-
-MY_P=${P/_pre/-testing-r}
-
-DESCRIPTION="A command-line based binary newsgrabber supporting .nzb files"
-HOMEPAGE="http://nzbget.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug gnutls ncurses parcheck ssl zlib"
-
-RDEPEND="dev-libs/libxml2
-	ncurses? ( sys-libs/ncurses )
-	parcheck? (
-		app-arch/libpar2
-		dev-libs/libsigc++:2
-	)
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? ( dev-libs/openssl )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README nzbget.conf )
-
-S=${WORKDIR}/${P/_pre*/-testing}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-14.0_pre1145-tinfo.patch
-
-	sed -i 's:^ScriptDir=.*:ScriptDir=/usr/share/nzbget/ppscripts:' nzbget.conf || die
-
-	sed \
-		-e 's:^MainDir=.*:MainDir=/var/lib/nzbget:' \
-		-e 's:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
-		-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:' \
-		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
-
-	sed -i "/^dist_doc_DATA/d" Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		--with-tlslib=$(usex gnutls GnuTLS OpenSSL)
-}
-
-src_install() {
-	default
-
-	# remove unneeded service script
-	rm "${D}"/usr/sbin/nzbgetd || die
-
-	insinto /etc
-	doins nzbget.conf
-	doins nzbgetd.conf
-
-	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
-	keepdir /var/log/nzbget
-
-	newinitd "${FILESDIR}"/nzbget.initd 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-19.1.ebuild b/net-nntp/nzbget/nzbget-19.1.ebuild
deleted file mode 100644
index c6d86f04383d..000000000000
--- a/net-nntp/nzbget/nzbget-19.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils 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"
-
-RDEPEND="dev-libs/libxml2
-	ncurses? ( sys-libs/ncurses:0= )
-	ssl? (
-		gnutls? (
-			net-libs/gnutls:=
-			dev-libs/nettle:=
-		)
-		!gnutls? ( dev-libs/openssl:0= )
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	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:^LockFile=.*:LockFile=/run/nzbget/nzbget.pid:' \
-		-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() {
-	econf \
-		$(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)
-}
-
-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 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-20.0_pre2176.ebuild b/net-nntp/nzbget/nzbget-21.0_pre2220.ebuild
index 604c8daa06db..59e359e545b3 100644
--- a/net-nntp/nzbget/nzbget-20.0_pre2176.ebuild
+++ b/net-nntp/nzbget/nzbget-21.0_pre2220.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils flag-o-matic user
+inherit autotools eutils flag-o-matic user systemd
 
 MY_PV=${PV/_pre/-r}
 MY_P=${PN}-${PV/_pre/-testing-r}
@@ -72,14 +72,16 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable ncurses curses) \
-		$(use_enable parcheck) \
-		$(use_enable ssl tls) \
-		$(use_enable zlib gzip) \
-		$(use_enable test tests) \
+	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() {
@@ -98,6 +100,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nzbget.initd-r1 nzbget
 	newconfd "${FILESDIR}"/nzbget.confd nzbget
+	systemd_dounit "${FILESDIR}"/nzbget.service
 }
 
 pkg_preinst() {
@@ -119,7 +122,7 @@ 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 "nzbget daemon to the nzbget group. To access the daemon, run nzbget"
 		elog "with the --configfile /etc/nzbgetd.conf option."
 		elog
 	fi