Version bump (#456336). Rebundle cherrypy until 0.8.0 comes out (#450242, #456338 and see comments in ebuild). Remove default user/pass.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

4 files changed, 131 insertions, 8 deletions

diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 9efcbd2384df..f5fd47a6969f 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2013/02/06 04:59:55 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.8 2013/02/14 18:39:40 jsbronder Exp $
+
+*sabnzbd-0.7.11 (14 Feb 2013)
+
+  14 Feb 2013; Justin Bronder <jsbronder@gentoo.org> +sabnzbd-0.7.11.ebuild:
+  Version bump (#456336). Rebundle cherrypy until 0.8.0 comes out (#450242,
+  #456338 and see comments in ebuild).  Remove default user/pass from config.
 
 *sabnzbd-0.7.10 (06 Feb 2013)
 
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 3d2d05ce4f5c..c0ca576e1a7d 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -3,18 +3,20 @@ Hash: SHA256
 
 AUX sabnzbd 281 SHA256 1224cb0157838e6d104592abd24b85eba832e23fbb57badd55e6877fd1bad17e SHA512 d3f064261c978fa4159b41636278f289bf549e2d83161652bce94e7a5ed3d1efdc3427cfdd84784bfc973ade589079417890fb8ced6eb04bad06628fbe6db66a WHIRLPOOL 6ee14687ed0a2f8be7dc7af1dd9e5d21ee07ee1788f3f7440094df9e0b28791f809ff1f9296df4771d1b50a62f19481f48ec674778a448bbb73267152d332f63
 AUX sabnzbd.confd 189 SHA256 684877bf6d36927b5e51a66c5f4bf539cdbb407d570ce4a35bdd309634bd5b11 SHA512 d62a867adca670d1679a2679b038bece85618083db4b7b3cc41bb86b389ce1e12f1d003499e93be94b1046228751f8424349847acc68e35165f0e64464c157c9 WHIRLPOOL 3ea13bbea28f4b78ad35f0efdfcaed44a2748e6b58bde5156feb643027a8adca7aaf42d55cbdcb08bdaa536fac90f429dfe361ef71e6f16716c6ac1f87c208a0
-AUX sabnzbd.ini 376 SHA256 3c21430b71a534d83d5cbc1d816cfcdb69fe8fab802882d11bc5c1d31c3362c5 SHA512 7cadfd9c30ccb916be42f0bb6421f0d8e9fa5461038bc031f135e1c90af4766d3df8a1d4bbf3f1c97424cd3311b7c71ff0914a48d6b98ec9974b580db8773652 WHIRLPOOL 07d6c008c1ed0b800fdae0dc5d3d42580839f10c5b8956daba306852c37a6ffd713da62aa46745bbde981095f44953abb44955c91513279c08f94a232c5a06ad
+AUX sabnzbd.ini 339 SHA256 4864a9a32b27f1435aec90802d0841fa459afb2734158ca5ab83e91070fc9b9e SHA512 94cd30bb1fb164aeb7f59c67de774ff0c7f4e6b46ab78cba6ed3e50dec59fd73e45c29369ecac53b5bfbaad13cc2dc132abc4822d6a596d3ba4eb0c5f7f33031 WHIRLPOOL 9a0c03787798830d57c12c504737dc607eab0946d4c029d64d14b4aebec16b3030527ade2718777a6e34ea2e637eaa743542e7c28dd4df6018c692704ea59225
 AUX sabnzbd.initd 1078 SHA256 422c4d7d7b90ed6308c530950f71770bf0d4a9eb0840b185bc23798763a8e9d8 SHA512 cce74b1a10dfa6b9a368c56e70f5f020a93eef8230b67395f95d2d951b088255b2347f9bbc4dd5284fc6c84ce4f2648c8fa439b5a763cf160924fbe74a26b4af WHIRLPOOL 07974b78d280d4127f882b09dea0cb7a96afbc87aca19b5cd3662586db5773bd30aa3bcca98884094838e6eefda536e4440a14052a290097d4002d49a066acb2
 AUX sabnzbd.logrotate 393 SHA256 276dffb9351074547d46f71699412aeb6ed80b39d0cdea499f86ebf5b8ae4f51 SHA512 26edf5095a3f69a339ecc924370becc7a26bc37ab4c31d8acf13cbcbaeb885471795ab2c69c9a434eab47886133fa781c9305c81360044f932cc280a6c491045 WHIRLPOOL 63a1ed259f44999355690fc5646b7de0f74577aefc5ad517888a2015e3d49478fb72dd9e0b52d0624812c6ecfcdc1c5d486ff6c1f921cc21bdc65b302c6f21e1
 AUX use-system-configobj-and-feedparser.patch 1254 SHA256 39e01c79058f37257e6f873f0e2643631d0f7c207fad058f227cfd0833f9ca9a SHA512 c2cf92909bd171d63179e4c2cbedf3f61b26bde2944e455b9ca798dd11aca5cccb85830df9d2f5800e5a0757e5ca9b14c78a275a025838a9ade52b6219a0af27 WHIRLPOOL df4221e3322d7c48e338e6cc80ef207f1dddcdc477e2a428825d3bf9c37772c545b94bebabb86e507ecece19a6a20bfc34356f6114dad521d3ee6e75a88ba2f5
 DIST SABnzbd-0.7.10-src.tar.gz 2273335 SHA256 79a44548e26147d72b3ea7a16fe198dd8e77f51d7f9093a8bac5a874fd5f5c43 SHA512 ac91e6193b678fdc4f375f5c2e582c8c222653b454e2bb00c75d2137b7a9250d8382ee8adc3e8d5b275dc091051fb3be9c0e622d143d6078dfe792e239d7d2a6 WHIRLPOOL ccd6c918f00eb1df70e7c909816a5884729d30163b1dabdb0ded0e8d61a57f22f90db677f2730a3baccae9679092d4225f97880634cf4bc282169d8ac1ab2026
+DIST SABnzbd-0.7.11-src.tar.gz 2273355 SHA256 de9c22377e89b081b7c264993c159588acb86206d1b82a465554e2f9df39b311 SHA512 4a56a597652b9587771994e5a57e59fb0d716a36c90d7f4058a05061e5679a7a6a0cfcd16f6d6b673a95fa02f16983755affbb2113f0b9da947303ea6f978bb9 WHIRLPOOL d278f742110f55eaa787c54c455079c46f537540b83362670590855c5697b3c27e31e334d915554db283f6f8c9c88c46bfa7c1f5729caae2a1bc3357b0ed75a4
 EBUILD sabnzbd-0.7.10.ebuild 2808 SHA256 9656b58a1c8d51aa4b3586943fddb1554eb5c4b6a4348d31ee37cd2974a12b2b SHA512 818d79e4b789641296d8651995971804522dd9317f2717ea3dc621d75d0c075b7bcfedaf4e99053cecd2743d91ec8b45cd83a70a71acf9eb38f35508e014c1ed WHIRLPOOL 35ea7f723f47c26e9e3d17bbf672606e993e456c341536cccea4c0c2fe7ce16b79ea73d06934727000a6efe251088a4a5140d3f469b5c82fb1850082ef5a650b
-MISC ChangeLog 1555 SHA256 513b52015053f7bb16f184b37a7a8e94975f153df6a7731545973e70b0492922 SHA512 7026b606b19f49101195a9edfaa904ed0bbfb0b7591f54c8a0b5640ab147a5f5fdff12f893a0ceaaee2a74fac877d2a6305dabc9260a88456e844db87bf0205f WHIRLPOOL 82b4574fd6a423919cf49f2e288375d98324f3155d1e4d7d9c9b1b64d8f52f8fa6af9cf30de1d7e9da4a0a622f88ffc9f27dc393acf19e5cae55d66449eecfb0
+EBUILD sabnzbd-0.7.11.ebuild 3126 SHA256 224d9245e1b55f738af58e9506565093bfb5749e0fb3669b120f808e4643c499 SHA512 7f5cf82ab9ab2ba38e742bcf5439cbe2bc9169efa73e88423d95bb51e718e26480aa121746de6ee778ed27003cd12d6486269b7eabaeb8b0577f47336ff7de4e WHIRLPOOL 96f4a487462e28a2b8bbab47a628ec6ebc44b7194d5153d1d7e89e6bb353fa95637564b214ddec19f63450b63e6861bd18f3a350628bda922469028f1d71c073
+MISC ChangeLog 1818 SHA256 0bd92824f949420c579feab589910be958134b6a083a0d4c3990a1c27c1b2fb5 SHA512 f14dcbe17b43a8b769121249ec62597e834b6e2dc64bf974446eb74bd250b212706196e773e1c9cc4deb3544cc147bd5f3de44d2dc6c88f5733839a06f5587e7 WHIRLPOOL 0e950f4071abdbc18e5691fa849fff0eca4b0f249457de9f2ba41eaafe3ea7b7d8ef535c8461c033d3a1872577322ce9765d984b1e2f5f829f70479cfe18a0b0
 MISC metadata.xml 484 SHA256 8e26c45345b47dbcdd018d9006a4d7f42a1394da6e39e9e968b1362480ae5d7a SHA512 18630bf4e3afa57977c1c4d7f562888c3048c3778a9aff4bba2e969f3f1934d8f85c22fef30c453f5ea09f410ce16761b75c25ba7d73ce1a14ea4abffcd918a6 WHIRLPOOL a399aa5a061fba0278117af2c8e18f88bb8cb10e049ff0cc9d86d9316497dcc5c13e55ceeea03b848ab4f796665e6efa0fc3345c02a4dcbbaacdef782ab7cc2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlER408ACgkQ4MrvBE1wQ8lBXgCfWcqQqOI5yc6sAUpPRXigYDfk
-8moAoKjsCJifUSUBA14PhNMhoT3ZxR/D
-=QFQr
+iEYEAREIAAYFAlEdL44ACgkQ4MrvBE1wQ8nILACggQp5L6N4v+WzRWoVsO6B5oes
+gyUAoK6UJLuHdfEjHM6bD8IREbVV+q/r
+=jsVv
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/sabnzbd/files/sabnzbd.ini b/net-nntp/sabnzbd/files/sabnzbd.ini
index 113c71428f1e..cfb55613f8dd 100644
--- a/net-nntp/sabnzbd/files/sabnzbd.ini
+++ b/net-nntp/sabnzbd/files/sabnzbd.ini
@@ -10,5 +10,3 @@ 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/sabnzbd-0.7.11.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.11.ebuild
new file mode 100644
index 000000000000..e5095cc486f7
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-0.7.11.ebuild
@@ -0,0 +1,117 @@
+# 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.11.ebuild,v 1.1 2013/02/14 18:39:40 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
+#
+# Also note that cherrypy is still bundled.  It's near impossible to find
+# out where the bundled and heavily patched version came from (pulled from 
+# cherrypy subversion, patched somewhere, then imported to sabnzbd and patched
+# further.  Upstream is planning on making this easier with 0.8.0.
+# https://github.com/sabnzbd/sabnzbd/issues/47
+
+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/unrar 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 -r sabnzbd/utils/{feedparser,configobj,gntp}.py
+	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}"
+
+	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/*
+}
+
+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}
+}