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

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

4 files changed, 126 insertions, 9 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/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
+}