Version bump. Use checkpath in the init script (bug #436642).

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 138 insertions, 19 deletions

diff --git a/net-nntp/nzbget/ChangeLog b/net-nntp/nzbget/ChangeLog
index eeba06a47d8d..2269756f8564 100644
--- a/net-nntp/nzbget/ChangeLog
+++ b/net-nntp/nzbget/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-nntp/nzbget
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.53 2012/12/16 21:26:36 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/ChangeLog,v 1.54 2013/01/08 18:33:58 radhermit Exp $
+
+*nzbget-9.1_pre538 (08 Jan 2013)
+
+  08 Jan 2013; Tim Harder <radhermit@gentoo.org> nzbget-9.0.ebuild,
+  +nzbget-9.1_pre538.ebuild, files/nzbget.initd:
+  Version bump. Use checkpath in the init script (bug #436642).
 
   16 Dec 2012; Tim Harder <radhermit@gentoo.org> -nzbget-9.0_pre511.ebuild,
   -nzbget-9.0_pre518.ebuild:
diff --git a/net-nntp/nzbget/Manifest b/net-nntp/nzbget/Manifest
index d162062a8b9f..f3d73c17ad73 100644
--- a/net-nntp/nzbget/Manifest
+++ b/net-nntp/nzbget/Manifest
@@ -5,21 +5,23 @@ AUX nzbget-0.7.0-openssl-1.patch 1075 SHA256 82558aa85bdd078fec12e33fddd23df38b4
 AUX nzbget-0.7.0-underlinking.patch 621 SHA256 d311471cc648346047681433d9d6b715e554e36979d8b6771b74eae5e5dcb9bf SHA512 ae633aa15bc87e1f11d8640e2350da69997b4218eeea38c4e724d98164bca7ae5e97f795e483149266a452a4a4337dc136152f85fb77c8e278d46415eb3e5813 WHIRLPOOL a14ef2ac34cfe7d36009772848f315a6be0863433a0dbc7d522262f15fe4b82093d2a51bcc60492a3815a072be81c73ee2b1881c502b98c99b51bc31bb74c9c3
 AUX nzbget-9.0_pre477-buffer-overflows.patch 1783 SHA256 687318fa04f1446abcd54c845b92febde7f6f0b790e968546a0a7daf2a2095d8 SHA512 bb9da489c0ca3d01fc2a98f3813bb4e8ab586d9bb9e0ad8e7d4e2cecf80430b03501f430fed21034bf34523987316f9dabd52a00b2edd737e2d89598939fbda5 WHIRLPOOL dc23b13d2251c6dd0d024fb35aa12c87709e9b4afdc84755b014dac4effd51a0e72793a390d05704ad7424bb8571dbc2faf1e89ef862a095fd9feffc5ba6eca9
 AUX nzbget.confd 337 SHA256 a2a305dc1ef482d82041c5261dba235f6faae229d894785f528d87c9c0e452b8 SHA512 0f9a0d62ac6ea35703ebd64ec68057596d63fd5957afa2d3bcd18b4e8db4b24e78d060dc36cf90dbd2f604b4c6f107fb8e59ff779b6865cd362e71a0666d6c56 WHIRLPOOL 220c7638c0f62f4cf4314e40b022c34c41a7124d6bf41bdf455948e2e862715413d62cc4750db63967b24f3cbf1b5d13cd3bcea4c016ee5611f5226a9f1bd750
-AUX nzbget.initd 870 SHA256 ded31c1ab53ccd4748f54ff231910cfdc75f023f09dd41e4b49bd9966a0c9d35 SHA512 6fab33b0c55bf7b5af7468bb488f57a04b4f00a42fecab39242d93618d835008bf9e4c2ad909ea4506b7cdab89141d26a7aa24d070c7f9836acf91002fcc30ef WHIRLPOOL 86e9359e0b0b96f73a48f71e41571ca3d0cfce2b35795119266ffc1518527c0b0c0d8de2c001563728c8b39c68aebba3fb2c921e136f633128f8ecb60f68df07
+AUX nzbget.initd 921 SHA256 5e55313eae69b0b77f4332c2ff6e74085295f6fc8469e03f53f9a425d0d19716 SHA512 e00f04e9eea6bbcdeb8b7e3e91ca93db36fbfec2cd6e26d72648fe497b50dbb29a99a43ba143682b80fc4d37d46e9db766f0a0fd0902355dceb3f9ab93051427 WHIRLPOOL 3f726527816518cc50a94468f116874892e0cc7f94bde8349b1c29195e637ea51730ea26b0d429e0e15920f9e90d23fb68db1929c28ddeb1672d9e9f214b519f
 DIST nzbget-0.8.0.tar.gz 321351 SHA256 646939596097fafdeb0b4064b433463419e7d0d9af7fe32f6689d6b95ad77d95 SHA512 ea9830effcfece3cc60592924840de3f65cf3c5581ed5afbc97c819c248c6b703a228e71bfb5997947c52c7efa84a5aa5457f7a7babc97ffae5b729179463ab3 WHIRLPOOL 692013bbf84c47f1bd22bdfce9554e3f5b2fb42892bf5b36e1a4612be7f3e85bad64897dfa48fa69ca96d2e9bd2fe923fca6171bf8843b96986f9ec55f949e2b
 DIST nzbget-9.0.tar.gz 656166 SHA256 40f9baefcd090f81a000149a79358a2639c5154579c026dba4317c566dd19ee4 SHA512 18786ae6d9b8b39d81732c00551077a1536170c3647013586d8c3eca5e680c84d9247944e838217af8a46ab0cae78c6982377cd11adcd0fd6ce18a199331f45b WHIRLPOOL 97c1f1162c2aee7f0ea09893d0ebf89dc2f1289ebfdb9b7f121c394a7270adf3be66e954182add088a5893057f1e273e80c555dccbef72fdd0473d05e8f8d5b0
+DIST nzbget-9.1-testing-r538.tar.gz 658787 SHA256 801cabb767663f31dd16595d0efba441e71c57d27e51552b751f77a3a148b99b SHA512 cce3a0a6ce9ff28da438685a7cfb20d05488c35a9d671829afae5233f3b56712c05eb66b535ed1383d4fb7fd1191efe7a875696ea271977fd5a47502a5193f58 WHIRLPOOL 1788f337d72652f1c8c38a83100b305db25106d26b7e6526d9b88c5c51a9aaf5d9fab12c78d3c4a81d290b44fea650c7ba82b8fcfcbd6a83d48de202b5566978
 EBUILD nzbget-0.8.0.ebuild 2516 SHA256 88a1c05bb61435371acd3ed782181f969612364142cd9e37ca46196d3170ce6d SHA512 c5fdf279a847808d667d30e76e57d6e31471f08822699dbb66ce2eab3c162655c16403402dddfbaa5f705252618385dfa44473a0ef18d46ac84d7849201511de WHIRLPOOL ba4a08d05b9a1fa50398d3f33c05edfd2ac9d909441235d88b515e0a5b43edf5b8bc760d983c63dd6fe43709dcd0a2dafe5c97a1a99b6f3a34c97e6262e57e77
-EBUILD nzbget-9.0.ebuild 2743 SHA256 63915c3828d0348dad2e68c568d85c5a5c6fe55a20ce6beb2e80deb5deb03ebd SHA512 52a02c24a8fb4ed2a83c2e6743aaf163d1969ed591f3d700dfe7f5e33ed19b22198d2669392eabf7713e4bd8aad4aec8ba44f0e1261a52a2d31d6d26b6e070f6 WHIRLPOOL 533419f9841b8a1774599bc0a13742822d7e9827807d1a412670c0f79efe57b1516ed72fb001ba3b2320b90704c184aeaa9eb5224fe2914faf8107a24bee8bab
-MISC ChangeLog 8381 SHA256 146f8afe9ba72399c9e0db83dc856cfe8aaa7f3ad469edec97352d4d26f78c6e SHA512 0aecd470765ab7606ac1bac2b4edc393b50f0deba08008c4d21d9f2f0c43d46aaaa52beec0a0823d56ba71c4a3b4e5cda268b5ecfd149e69a549edad96ec2e6b WHIRLPOOL 19baa361c399f4d5d792fd495ef4db1b199e779b00955e2b4a33169d92aebc70bb59108c1bf07edf545baf55a5378f4731957a4088668233fb7f24b94c6dedc5
+EBUILD nzbget-9.0.ebuild 2707 SHA256 1ccc6cd8e55dccc92342cf7303b5aaf3b9e4d548f34203bb1c34ffc84c1acf97 SHA512 b4b98babde859e27ce84417db0fda83560e4451be4cd5f234f6f6bb5bc1f2d561f5d4a66f0c84eb055747cadd4c89f1a1c93d95c917cdf71481f53a534740054 WHIRLPOOL 82b8ecee295d5ef0a303a90e1a2b9f367efca66376fb3a6460e6e39d23453685bdeda16797091e01308471bea41dea03d957919865ef1a62ff6838e72ea5aaca
+EBUILD nzbget-9.1_pre538.ebuild 2714 SHA256 e2b3e93e587a2c8a91fc8b4f3eb9084e8d1c2e4065f8d8f9b4de2c610ea38100 SHA512 453adbf42f8c36394f6577af4e408fdc5efba66953cb9e637b6285357b7c955e730d43e3269e09d69490a6a88e37592c740edea87babd893103e93416f59de01 WHIRLPOOL 5ca28606434e23bf492ef02323540e61102e9a6b3e6616fed4467003556d91fced8a20d7b8d2e337784f8ec515f235e7cdeb061c0bdd139b25f42709f272a0ab
+MISC ChangeLog 8597 SHA256 16e3b60ad0f85c87f439e2b1b2802555577325277f6dcc76a1ec2a6adfc4ebd2 SHA512 1a7255a99e7065344ac57bec7278547630e0e5b2da8e44b2c82f2fef656a4d4607f4fc2e993bc85a4261e42ec4000a3b1ec74fb4586db1a6a81fcfe537b3d2f6 WHIRLPOOL 3457b2407c8c88f57759557c735aa964af3dae064dd112e4d2fd922800fd9d12fac51353aef2203aa0c46ec175812ef5bbb96cb39b1f0bf4596a9eec4c2e03d0
 MISC metadata.xml 539 SHA256 48f9bc14033c2a447322b31e146267269726e47b8925fed04eb763fae4655e31 SHA512 bb80f64f00b908a589e8c9aad6e7be82fe2d44507cf7cb625c2b718f28a62dd86b6e530be16e0cae1209109b5289829211d120db24b5c2249263a8227b18fd26 WHIRLPOOL adc2d684e0c54ad489401de1ab2a7a76307ccf7bccfd80b00aed81b3ba09983f933469b7bcb126372616e5eab52d4caa9564a9cd3f14e713acb84e35605fc2f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQzjyNAAoJEEqz6FtPBkyj3tcH/RCdmSJ6NwK4a7BZr9T+SLhI
-zF0NCMzIn7HuiRF2+6a0tH2LWpE4G2u0YQMNb4HmXU9tbaT6vuwOxXTF8mHO5MuY
-J0olr+hTfzW5LtaXl4xdolm8q1gY2IcryeGfcf/bUy8rYrrEJjSSpf9zwITm4KFl
-ZNVgACABtCmdg1Un5mqgNIuF8Lsb+E2SHy7DGaARaN7+YPCs16zE6si/DSSsMJDQ
-UYwa7jek+XGjBTCuiqUaJTAgunKdwEBkTAx2Wf62oqLjwPxzorIHi9BcMCKBHYJH
-ywlffnFX60rMGVIKtjSPJH3FgkJ1PCQe+cqPfvE2o4l2mlMwhL5y0xZNd/Y9Ecc=
-=7iyh
+iQEcBAEBCAAGBQJQ7GacAAoJEEqz6FtPBkyjW1IH/jflr38RZuc4OV06ibNF4mVg
+5nOKIULxUIjC27qSWlbJjSgryO/8pAN2Uq38rQQqiae66hSfJZ6BX0x7Q7YQFpej
+I9p5OfqyFvSmWb4Rm+MPFuqaIjFPevMO2KWjJJRxWO452KwGNoaPjsCqlwpSe5gi
++R6kMTlQOwPxb1E1G+nzzMSzp5C1cLB3i5yMw68f5sFLdK4+NOanfztYjoUqvHQW
+HFalGWxwjRcVHd/BBxB10Cm9o9oz4O6odU4md4nerQMx8VIrSrc/4ldH8Fn+kTHj
+evEDbUrvcs1LO0AfCJiBttn4/iCbZDCAa2WuqKF8sxgcvPqtujM1E+z+T8fE+28=
+=kWtv
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/nzbget/files/nzbget.initd b/net-nntp/nzbget/files/nzbget.initd
index 22a6450dbacf..8f0214c9ce6f 100644
--- a/net-nntp/nzbget/files/nzbget.initd
+++ b/net-nntp/nzbget/files/nzbget.initd
@@ -1,12 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/files/nzbget.initd,v 1.4 2012/11/02 06:15:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/files/nzbget.initd,v 1.5 2013/01/08 18:33:59 radhermit Exp $
 
 extra_started_commands="pause unpause"
 
 start() {
 	ebegin "Starting nzbget"
+	checkpath -d -m 0755 -o nzbget:nzbget /run/nzbget
 	start-stop-daemon --quiet --start --user "${NZBGET_USER}" \
 		--group "${NZBGET_GROUP}" --exec /usr/bin/nzbget -- \
 		--configfile "${NZBGET_CONFIGFILE}" --daemon \
diff --git a/net-nntp/nzbget/nzbget-9.0.ebuild b/net-nntp/nzbget/nzbget-9.0.ebuild
index cd01b9e1f583..f19eb44d09de 100644
--- a/net-nntp/nzbget/nzbget-9.0.ebuild
+++ b/net-nntp/nzbget/nzbget-9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-9.0.ebuild,v 1.1 2012/12/16 21:25:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-9.0.ebuild,v 1.2 2013/01/08 18:33:58 radhermit Exp $
 
 EAPI="5"
 
@@ -80,7 +80,7 @@ src_install() {
 	rm "${D}"/usr/bin/nzbget-postprocess.sh
 
 	keepdir /var/lib/nzbget/{dst,nzb,queue,tmp}
-	keepdir /var/log/nzbget /run/nzbget
+	keepdir /var/log/nzbget
 
 	newinitd "${FILESDIR}"/nzbget.initd nzbget
 	newconfd "${FILESDIR}"/nzbget.confd nzbget
@@ -94,8 +94,8 @@ pkg_preinst() {
 	fperms 750 /var/lib/nzbget/{queue,tmp}
 	fperms 770 /var/lib/nzbget/{dst,nzb}
 
-	fowners nzbget:nzbget /var/log/nzbget /run/nzbget
-	fperms 750 /var/log/nzbget /run/nzbget
+	fowners nzbget:nzbget /var/log/nzbget
+	fperms 750 /var/log/nzbget
 
 	fowners root:nzbget /etc/nzbgetd.conf
 	fperms 640 /etc/nzbgetd.conf
diff --git a/net-nntp/nzbget/nzbget-9.1_pre538.ebuild b/net-nntp/nzbget/nzbget-9.1_pre538.ebuild
new file mode 100644
index 000000000000..1e0ccefef421
--- /dev/null
+++ b/net-nntp/nzbget/nzbget-9.1_pre538.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/nzbget/nzbget-9.1_pre538.ebuild,v 1.1 2013/01/08 18:33:58 radhermit Exp $
+
+EAPI="5"
+
+inherit eutils autotools user
+
+MY_P=${P/_pre/-testing-r}
+
+DESCRIPTION="A command-line based binary newsgrapper 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() {
+	sed -i 's:^PostProcess=.*:#PostProcess=/usr/share/nzbget/nzbget-postprocess.sh:' \
+		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:' \
+		"${S}"/nzbget.conf > "${S}"/nzbgetd.conf || die
+
+	sed -i "/^dist_doc_DATA/d" Makefile.am || die
+
+	epatch "${FILESDIR}"/${PN}-0.7.0-underlinking.patch
+	epatch "${FILESDIR}"/${PN}-9.0_pre477-buffer-overflows.patch
+
+	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
+
+	exeinto /usr/share/nzbget
+	doexe nzbget-postprocess.sh
+
+	# remove duplicate script/config
+	rm "${D}"/usr/share/nzbget/nzbget.conf
+	rm "${D}"/usr/bin/nzbget-postprocess.sh
+
+	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 root:nzbget /etc/nzbgetd.conf
+	fperms 640 /etc/nzbgetd.conf
+}
+
+pkg_postinst() {
+	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
+}