Support newer versions of dev-python/gntp, resolves #474540.

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

4 files changed, 165 insertions, 5 deletions

diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 280c3b2c1d7c..218d813a4cec 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.13 2013/06/24 22:50:31 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.14 2013/06/24 23:20:03 jsbronder Exp $
+
+*sabnzbd-0.7.13-r1 (24 Jun 2013)
+
+  24 Jun 2013; Justin Bronder <jsbronder@gentoo.org> +sabnzbd-0.7.13-r1.ebuild,
+  +files/growler-support-gntp-1.0.patch:
+  Support newer versions of dev-python/gntp, resolves #474540.
 
   24 Jun 2013; Justin Bronder <jsbronder@gentoo.org> -sabnzbd-0.7.10.ebuild,
   -sabnzbd-0.7.11.ebuild, -sabnzbd-0.7.12.ebuild:
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 599592ff6ae0..616dd54b5bc8 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX growler-support-gntp-1.0.patch 886 SHA256 8a9daee5d8860c97d504a59842acf22de0a5197785a0a56a9f61793e0d250de9 SHA512 a06b32146a34bc8a1765e248a39a70490f54a4f898cd6aa364631d95793d1b225f413c7f4c4d7e52a06b906701f216ca73d457e90ac73d133333d0230c3d0a68 WHIRLPOOL 5cd32d5c1ad15adb86248de0952cc87d2e3878915f6e0105265a7c572dd354046506a19d8a05450b1ffde8b2017714ecfafd1bdd6bc025be16c3a316306d4c27
 AUX sabnzbd 281 SHA256 1224cb0157838e6d104592abd24b85eba832e23fbb57badd55e6877fd1bad17e SHA512 d3f064261c978fa4159b41636278f289bf549e2d83161652bce94e7a5ed3d1efdc3427cfdd84784bfc973ade589079417890fb8ced6eb04bad06628fbe6db66a WHIRLPOOL 6ee14687ed0a2f8be7dc7af1dd9e5d21ee07ee1788f3f7440094df9e0b28791f809ff1f9296df4771d1b50a62f19481f48ec674778a448bbb73267152d332f63
 AUX sabnzbd.confd 189 SHA256 684877bf6d36927b5e51a66c5f4bf539cdbb407d570ce4a35bdd309634bd5b11 SHA512 d62a867adca670d1679a2679b038bece85618083db4b7b3cc41bb86b389ce1e12f1d003499e93be94b1046228751f8424349847acc68e35165f0e64464c157c9 WHIRLPOOL 3ea13bbea28f4b78ad35f0efdfcaed44a2748e6b58bde5156feb643027a8adca7aaf42d55cbdcb08bdaa536fac90f429dfe361ef71e6f16716c6ac1f87c208a0
 AUX sabnzbd.ini 339 SHA256 4864a9a32b27f1435aec90802d0841fa459afb2734158ca5ab83e91070fc9b9e SHA512 94cd30bb1fb164aeb7f59c67de774ff0c7f4e6b46ab78cba6ed3e50dec59fd73e45c29369ecac53b5bfbaad13cc2dc132abc4822d6a596d3ba4eb0c5f7f33031 WHIRLPOOL 9a0c03787798830d57c12c504737dc607eab0946d4c029d64d14b4aebec16b3030527ade2718777a6e34ea2e637eaa743542e7c28dd4df6018c692704ea59225
@@ -8,13 +9,14 @@ AUX sabnzbd.initd 1801 SHA256 fe4a95b6d02c1e62996813c8249f40a01c7181e8d44d1f0344
 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.13-src.tar.gz 2275234 SHA256 33ebef37e7cdbcc1e3a7436432d7701b3f2584b754176a4d9000ac125e25d690 SHA512 8462e7f39da0e2c829bebca97cbdbb5f6d314e04c408257064d68bf2d17fc37301e53daf695e8db6e5af82d844f6e99fbbed8c500e2bd3d3916a8b3431e1248c WHIRLPOOL cc9c14b6d86108038eee3c934aa1ecc2c95947d8493799b750cf59d1d44f81f5d13cc492fb0f4f8204cd64629e85f707b83b7f971bcb8ef296c65bf28f8bd1eb
+EBUILD sabnzbd-0.7.13-r1.ebuild 3200 SHA256 e71533badc8538b6cdcd11a374d9d97ffe01c168a7dbfcc51a60c099d14811f2 SHA512 da220c2ef621ff31de0e991237bf7e6c3c0f10f0ce75901cf2054111b8edf9b87eec505141ad7d33bb490d163b666e67c6755bf84db3a1aa075969664a99b084 WHIRLPOOL 19abfdbc1d736b9307db06da9fbad2c1f4c2507a86bb09e6d98ce5ea2697f67146c12320cfb04414f945029689da3117c9f9601c7c1dd7fe49159fcad8bb0fb5
 EBUILD sabnzbd-0.7.13.ebuild 3144 SHA256 dac56ef7524de67cd4fd50d8928373adb31103ad7e8665392a735021a26c9054 SHA512 58e8d22b64347c36f9a3531105239a82165a09ef71137390e121f6453b14f64d36bbbd4ffd02fb2bcf09aca76ace88bfbb41c57d18a2993cd396bd7c2a0a8d70 WHIRLPOOL 4b9d0350c3f211454127e7f071d70698ad2df8604dfe414e3f930c8f7e3a818423d19718918885a5bf309203ae96697c09ca47c8c20c3da2edba32aa02cb17b7
-MISC ChangeLog 2470 SHA256 a2a51034c2056b6ed91d4d31e27884ec2d3ede8d29368fc1077c0eb68c3c4991 SHA512 5d44170c600cd653890c26edb50a65ee3e38e9155e5b5aff7d19238af0d3708b28755fd85e507fa8607354c695065e2cbb35d97d82ef343ab39a25d64ef6b21d WHIRLPOOL 7cbdb4807372d59a11b3b28b9b615c83fcdf63cbf1f2c33a9674e17f510ea57532126958750908c163b18fa43e52ca6a626ec1f26268ddb710954d2d9bdf6bc7
+MISC ChangeLog 2689 SHA256 c2ce89266b50ed1234119c6fcb476af6c4239201044ed79c61e78b4696a258bd SHA512 1d4dabe847430cd074be249ff7b7beed50fd9bcdbc273a30cd4ab3f911b56830589ae66b8bd0b5f9f1d21e80d54ff2f29efee56f485ab10cd26c7e1e7d61b23c WHIRLPOOL 5cf25b3cebe40005396476f3211921f5e39c0c43f817105b99d39a72d8df8ef5a210136717711cd9d12a277c1f9a3a0c930d04960fd421fd69e35af2b1bc9292
 MISC metadata.xml 484 SHA256 8e26c45345b47dbcdd018d9006a4d7f42a1394da6e39e9e968b1362480ae5d7a SHA512 18630bf4e3afa57977c1c4d7f562888c3048c3778a9aff4bba2e969f3f1934d8f85c22fef30c453f5ea09f410ce16761b75c25ba7d73ce1a14ea4abffcd918a6 WHIRLPOOL a399aa5a061fba0278117af2c8e18f88bb8cb10e049ff0cc9d86d9316497dcc5c13e55ceeea03b848ab4f796665e6efa0fc3345c02a4dcbbaacdef782ab7cc2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlHIzUAACgkQ4MrvBE1wQ8kLngCgoJEq/eXGYmMC7VFN3cKS6FMO
-l+QAn09Zj+JJvCD/jxG3YfFFLiB+6Lns
-=ndZg
+iEYEAREIAAYFAlHI1CQACgkQ4MrvBE1wQ8nTyACfT+B5u5mPJxURRnCPSimj+eXg
+Jt4An1GJiotqjY+c6cm/TwxLXXlDaPzl
+=McUZ
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/sabnzbd/files/growler-support-gntp-1.0.patch b/net-nntp/sabnzbd/files/growler-support-gntp-1.0.patch
new file mode 100644
index 000000000000..560b88a18d49
--- /dev/null
+++ b/net-nntp/sabnzbd/files/growler-support-gntp-1.0.patch
@@ -0,0 +1,33 @@
+From 96b4891d2323cb44f479bc94d1410348b1468298 Mon Sep 17 00:00:00 2001
+From: Justin Bronder <jsbronder@gmail.com>
+Date: Mon, 24 Jun 2013 19:03:17 -0400
+Subject: [PATCH] growler:  support >=gntp-1.0
+
+Fixes Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=474540
+---
+ sabnzbd/growler.py | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/sabnzbd/growler.py b/sabnzbd/growler.py
+index d250703..f39bb44 100644
+--- a/sabnzbd/growler.py
++++ b/sabnzbd/growler.py
+@@ -31,7 +31,14 @@ import sabnzbd
+ import sabnzbd.cfg
+ from sabnzbd.encoding import unicoder, latin1
+ from sabnzbd.constants import NOTIFY_KEYS
+-from gntp import GNTPRegister
++
++try:
++    # <= version 0.6
++    from gntp import GNTPRegister
++except ImportError:
++    # >= version 1.0
++    from gntp.core import GNTPRegister
++
+ from gntp.notifier import GrowlNotifier
+ try:
+     import Growl
+-- 
+1.8.1.5
+
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.13-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.13-r1.ebuild
new file mode 100644
index 000000000000..75a6b9f16c12
--- /dev/null
+++ b/net-nntp/sabnzbd/sabnzbd-0.7.13-r1.ebuild
@@ -0,0 +1,119 @@
+# 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.13-r1.ebuild,v 1.1 2013/06/24 23:20:03 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
+	epatch "${FILESDIR}"/growler-support-gntp-1.0.patch
+
+	# remove bundled modules
+	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
+	rm -r gntp || die
+	rm licenses/License-{feedparser,configobj,gntp}.txt || die
+}
+
+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}
+}