Bump, add .ini and logrotate files, use yenc by default, fix rar dep (#455190). Fix unbundling of cherrypy.

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

5 files changed, 48 insertions, 111 deletions

diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 56e7a1901100..9efcbd2384df 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2013/01/11 19:53:53 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.7 2013/02/06 04:59:55 jsbronder Exp $
+
+*sabnzbd-0.7.10 (06 Feb 2013)
+
+  06 Feb 2013; Justin Bronder <jsbronder@gentoo.org> -sabnzbd-0.7.7.ebuild,
+  -sabnzbd-0.7.9.ebuild, +sabnzbd-0.7.10.ebuild, +files/sabnzbd.ini,
+  +files/sabnzbd.logrotate:
+  Bump, add .ini and logrotate files, use yenc by default, fix rar dep
+  (#455190). Fix unbundling of cherrypy.
 
   11 Jan 2013; Justin Bronder <jsbronder@gentoo.org> files/sabnzbd:
   Wrap sabnzbd.py with either python2.7 or python2.6. Resolves #450698.
diff --git a/net-nntp/sabnzbd/files/sabnzbd.ini b/net-nntp/sabnzbd/files/sabnzbd.ini
new file mode 100644
index 000000000000..113c71428f1e
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd.ini
@@ -0,0 +1,14 @@
+__version__ = 19

+[misc]

+log_dir = /var/log/sabnzbd

+admin_dir = /var/lib/sabnzbd/admin

+cache_dir = /var/lib/sabnzbd/cache

+complete_dir = /var/lib/sabnzbd/complete

+download_dir = /var/lib/sabnzbd/download

+dirscan_dir = /var/lib/sabnzbd/dirscan

+nzb_backup_dir = /var/lib/sabnzbd/backup

+auto_browser = 0

+host = 0.0.0.0

+port = 8080

+username = sabnzbd

+password = secret
\ No newline at end of file
diff --git a/net-nntp/sabnzbd/files/sabnzbd.logrotate b/net-nntp/sabnzbd/files/sabnzbd.logrotate
new file mode 100644
index 000000000000..3910e33fd649
--- /dev/null
+++ b/net-nntp/sabnzbd/files/sabnzbd.logrotate
@@ -0,0 +1,13 @@
+# 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.logrotate,v 1.1 2013/02/06 04:59:55 jsbronder Exp $
+
+/var/log/sabnzbd/*.log{
+	missingok
+	notifempty
+	su sabnzbd sabnzbd
+	sharedscripts
+	postrotate
+		/etc/init.d/sabnzbd status && /etc/init.d/sabnzbd restart
+	endscript
+}
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.9.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.10.ebuild
index 42eeaa53ef59..43184576b625 100644
--- a/net-nntp/sabnzbd/sabnzbd-0.7.9.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-0.7.10.ebuild
@@ -1,6 +1,6 @@
 # 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.9.ebuild,v 1.1 2013/01/06 22:01:20 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/sabnzbd-0.7.10.ebuild,v 1.1 2013/02/06 04:59:55 jsbronder Exp $
 
 EAPI="4"
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/sabnzbdplus/${MY_P}-src.tar.gz"
 LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+rar +ssl unzip yenc"
+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
@@ -38,7 +38,7 @@ RDEPEND="
 	dev-python/gntp
 	dev-python/pythonutils
 	net-misc/wget
-	rar? ( app-arch/rar )
+	rar? ( || ( app-arch/unrar app-arch/rar ) )
 	ssl? ( dev-python/pyopenssl )
 	unzip? ( >=app-arch/unzip-5.5.2 )
 	yenc? ( dev-python/yenc )
@@ -61,7 +61,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/use-system-configobj-and-feedparser.patch
 
 	# remove bundled modules
-	rm sabnzbd/utils/{feedparser,configobj,gntp}.py cherryp
+	rm -r sabnzbd/utils/{feedparser,configobj,gntp}.py cherrypy
 	rm licenses/License-{feedparser,configobj,gntp,CherryPy}.txt
 }
 
@@ -74,7 +74,7 @@ src_install() {
 	fperms +x /usr/share/${PN}/SABnzbd.py
 	dobin "${FILESDIR}"/sabnzbd
 
-	for d in cherrypy email icons interfaces locale po sabnzbd tools util; do
+	for d in email icons interfaces locale po sabnzbd tools util; do
 		insinto /usr/share/${PN}/${d}
 		doins -r ${d}/*
 	done
@@ -82,10 +82,17 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/"${PN}.logrotate ${PN}
+
 	diropts -o ${PN} -g ${PN}
 	dodir /etc/${PN}
 	dodir /var/log/${PN}
 
+	insinto "/etc/${PN}"
+	insopts -m 0600 -o ${PN} -g ${PN}
+	doins "${FILESDIR}/${PN}.ini"
+
 	dodoc {ABOUT,CHANGELOG,ISSUES,README}.txt Sample-PostProc.sh licenses/*
 }
 
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.7.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.7.ebuild
deleted file mode 100644
index 39a21cea68b0..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-0.7.7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.7.ebuild,v 1.2 2013/01/03 23:05:32 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"
-
-# We actually depend on dev-python/cherrypy as well but upstream has decided
-# to bundle a custom cut of the 3.2.0 branch.  Also, 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: kronos, rarfile, rsslib, ssmtplib, listquote, jso
-# Probably others, see licenses/
-
-RDEPEND="
-	>=app-arch/par2cmdline-0.4
-	>=dev-python/cheetah-2.0.1
-	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
-	rm licenses/License-{feedparser,configobj,gntp}.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}
-}