Bump (#450208), use system cherrypy-3.2* (#450242), respect logging settings from conf.d

(Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 4D7043C9)

3 files changed, 115 insertions, 2 deletions

diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 6cab61bb4032..029f6ba31f55 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nntp/sabnzbd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.2 2013/01/03 23:05:32 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.3 2013/01/06 19:44:48 jsbronder Exp $
+
+*sabnzbd-0.7.8 (06 Jan 2013)
+
+  06 Jan 2013; Justin Bronder <jsbronder@gentoo.org> +sabnzbd-0.7.8.ebuild,
+  files/sabnzbd.initd:
+  Bump (#450208), use system cherrypy-3.2* (#450242), respect logging settings
+  from conf.d
 
   03 Jan 2013; Justin Bronder <jsbronder@gentoo.org> sabnzbd-0.7.7.ebuild,
   metadata.xml:
diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
index b3e0af0ef4fc..4493474c5944 100644
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.initd,v 1.1 2013/01/03 20:02:32 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/files/sabnzbd.initd,v 1.2 2013/01/06 19:44:49 jsbronder Exp $
 
 
 depend() {
@@ -21,6 +21,7 @@ start() {
         -- \
         --server ${SABNZBD_SERVER}:${SABNZBD_PORT} \
         --config-file ${SABNZBD_CONFIGFILE} \
+        --logging ${SABNZBD_LOGGING} \
         --daemon
     eend $?
 }
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.8.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.8.ebuild
new file mode 100644
index 000000000000..7ceb8cb5429d
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-0.7.8.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/sabnzbd-0.7.8.ebuild,v 1.1 2013/01/06 19:44:48 jsbronder Exp $
+
+EAPI="4"
+
+# Require python-2 with sqlite USE flag
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="sqlite"
+
+inherit eutils python user
+
+MY_P="${P/sab/SAB}"
+
+DESCRIPTION="Binary newsgrabber with web-interface"
+HOMEPAGE="http://www.sabnzbd.org/"
+SRC_URI="mirror://sourceforge/sabnzbdplus/${MY_P}-src.tar.gz"
+
+# Sabnzbd is GPL-2 but bundles software with the following licenses.
+LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rar +ssl unzip yenc"
+
+# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
+# be in python's sitedir.  See:  http://wiki.sabnzbd.org/unix-packaging
+
+# TODO:  still bundled but not in protage:
+# kronos, rarfile, rsslib, ssmtplib, listquote, json-py, msgfmt
+# pynewsleecher
+
+RDEPEND="
+	>=app-arch/par2cmdline-0.4
+	>=dev-python/cheetah-2.0.1
+	=dev-python/cherrypy-3.2*
+	dev-python/configobj
+	dev-python/feedparser
+	dev-python/gntp
+	dev-python/pythonutils
+	net-misc/wget
+	rar? ( app-arch/rar )
+	ssl? ( dev-python/pyopenssl )
+	unzip? ( >=app-arch/unzip-5.5.2 )
+	yenc? ( dev-python/yenc )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	HOMEDIR="/var/lib/${PN}"
+	python_set_active_version 2
+	python_pkg_setup
+
+	# Create sabnzbd group
+	enewgroup ${PN}
+	# Create sabnzbd user, put in sabnzbd group
+	enewuser "${PN}" -1 -1 "${HOMEDIR}" "${PN}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/use-system-configobj-and-feedparser.patch
+
+	# remove bundled modules
+	rm sabnzbd/utils/{feedparser,configobj,gntp}.py cherryp
+	rm licenses/License-{feedparser,configobj,gntp,CherryPy}.txt
+}
+
+src_install() {
+	local d
+
+	dodir /usr/share/${PN}/sabnzbd
+	insinto /usr/share/${PN}/
+	doins SABnzbd.py
+	fperms +x /usr/share/${PN}/SABnzbd.py
+	dobin "${FILESDIR}"/sabnzbd
+
+	for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
+		insinto /usr/share/${PN}/${d}
+		doins -r ${d}/*
+	done
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	diropts -o ${PN} -g ${PN}
+	dodir /etc/${PN}
+	dodir /var/log/${PN}
+
+	dodoc {ABOUT,CHANGELOG,ISSUES,README}.txt Sample-PostProc.sh licenses/*
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/share/${PN}
+
+	einfo "Default directory: ${HOMEDIR}"
+	einfo ""
+	einfo "Run: gpasswd -a <user> sabnzbd"
+	einfo "to add an user to the sabnzbd group so it can edit sabnzbd files"
+	einfo ""
+	einfo "By default sabnzbd will listen on 127.0.0.1:8080"
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/share/${PN}
+}