Version bump and remove old (#484226). Fix initd script thanks to eponymous (#483786). Remove logrotate (#483672). Fix issues with stable version of par2cmdline thanks to dcb (#480302).

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

7 files changed, 85 insertions, 194 deletions

diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 5568fa42da24..0de9d31bcd43 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.17 2013/09/08 14:32:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.18 2013/10/08 23:19:35 jsbronder Exp $
+
+*sabnzbd-0.7.16 (08 Oct 2013)
+
+  08 Oct 2013; Justin Bronder <jsbronder@gentoo.org> -sabnzbd-0.7.13-r2.ebuild,
+  -sabnzbd-0.7.14.ebuild, +sabnzbd-0.7.16.ebuild, +files/par2cmdline.patch,
+  files/sabnzbd.initd, -files/sabnzbd.logrotate:
+  Version bump and remove old (#484226). Fix initd script thanks to eponymous
+  (#483786). Remove logrotate (#483672). Fix issues with stable version of
+  par2cmdline thanks to dcb (#480302).
 
   08 Sep 2013; Jeroen Roovers <jer@gentoo.org> files/sabnzbd.ini:
   Fix CRLF by eponymous (bug #484236).
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 2802f896d709..99f71659c575 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,22 +2,20 @@
 Hash: SHA256
 
 AUX growler-support-gntp-1.0.patch 886 SHA256 8a9daee5d8860c97d504a59842acf22de0a5197785a0a56a9f61793e0d250de9 SHA512 a06b32146a34bc8a1765e248a39a70490f54a4f898cd6aa364631d95793d1b225f413c7f4c4d7e52a06b906701f216ca73d457e90ac73d133333d0230c3d0a68 WHIRLPOOL 5cd32d5c1ad15adb86248de0952cc87d2e3878915f6e0105265a7c572dd354046506a19d8a05450b1ffde8b2017714ecfafd1bdd6bc025be16c3a316306d4c27
+AUX par2cmdline.patch 503 SHA256 2c732d21cc3c39abf3abaf1d26b18445f37a7515f1857e163b4fdb4409a0b3ae SHA512 dcf985d06b3a20de757a819b5f08c681ea3dbb2ebd5891f9e09f0e01ccb124789ee909259625ebf5afe2b0c0250aa369d0aa9d5346bd246f058785117fd95e3d WHIRLPOOL 6fedded07852cbb372d40dbfb5148d5b5517f55d2eba7da2b7283eaf9f637eccaee4169f3ca502ac0081542c0e9df785e9e7df7a32067466509ffc7e58c39f6e
 AUX sabnzbd 281 SHA256 1224cb0157838e6d104592abd24b85eba832e23fbb57badd55e6877fd1bad17e SHA512 d3f064261c978fa4159b41636278f289bf549e2d83161652bce94e7a5ed3d1efdc3427cfdd84784bfc973ade589079417890fb8ced6eb04bad06628fbe6db66a WHIRLPOOL 6ee14687ed0a2f8be7dc7af1dd9e5d21ee07ee1788f3f7440094df9e0b28791f809ff1f9296df4771d1b50a62f19481f48ec674778a448bbb73267152d332f63
 AUX sabnzbd.confd 148 SHA256 071251fe47e594d65d017540cc2a84465dab242df5b621d500befcdd280bc458 SHA512 a06d2bf1663ec63da2754747cd5518a56604fcef84840cdaa160722c18ec0b42a3ee0ea7d6ecec6525d4bf264184f3627553bcab67395b31acc40b95b4c6f651 WHIRLPOOL 1e1c40dba40bdd73990295980ceb91ee4abf9cd5887f377e6305b7d3c1eda17595584dfd3c9b49c99b5749a146c815d9706cb989b3f1b0652fe92a8e0cc5d3bf
 AUX sabnzbd.ini 352 SHA256 66501a7708f157f866f75c3c25b75291f2c501f54b0b81ee47a92e34242dc537 SHA512 f986cf5b5243363969db655f301c88a971788bf8f9f69c8faf4f580d5852cad6f59567daad79461c31c3cea0474accb085dca3972c821c2cf2aed4063226b077 WHIRLPOOL 2355518ab720d63bbb1e5f6cce16c2de75fc87b28070610f4177bff34ef71bc0d366eb8d68d8f96b1b4f57e688741a834aac1848e3c0c249e109f4818579aa94
-AUX sabnzbd.initd 2410 SHA256 64ee769889fc4bcfe4a09cf6c95636a7f0dc130587046049eefeecf127c56a2e SHA512 e5d3707f8bc4b7930933d300954b7f71041be7be5151ff2395cc7bf1c1bd4783c202b9c8ddb9889e7a188b30c8ecc62337cd97bdd47bd42d55ff58552d98c48e WHIRLPOOL 9cab4288afaa1eda4d9fc28bd459a851f59ca7ddd3adace0694761b3dd064d9a7e6451a886fda7a9fa08a54a900e2c656d38f7def29f419bd960336ea6120446
-AUX sabnzbd.logrotate 393 SHA256 276dffb9351074547d46f71699412aeb6ed80b39d0cdea499f86ebf5b8ae4f51 SHA512 26edf5095a3f69a339ecc924370becc7a26bc37ab4c31d8acf13cbcbaeb885471795ab2c69c9a434eab47886133fa781c9305c81360044f932cc280a6c491045 WHIRLPOOL 63a1ed259f44999355690fc5646b7de0f74577aefc5ad517888a2015e3d49478fb72dd9e0b52d0624812c6ecfcdc1c5d486ff6c1f921cc21bdc65b302c6f21e1
+AUX sabnzbd.initd 2180 SHA256 89405865bafee55553672ac4a3ad815254eb8bf7af17205723ed3eacef1f483c SHA512 36160bd616a2e9069fc40e676a9bc73ae7e26733308fbfb57bd9ce779472037f6bc485660609bf446fad17d0e523eab30f15196293eb791cf4294734c2aa877d WHIRLPOOL a2823075d31f8c843e7920b43a4754362c15d02280d094d35102e9e8795d198fe3e5d09a63d2aa24eb3182da2b597e041401fb0eb986ac1cf08c27cd383efc3a
 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
-DIST SABnzbd-0.7.14-src.tar.gz 2275312 SHA256 b5aefb2911349697db3be86eca815622a2bddb4ab370ed5522b4b0322d45c843 SHA512 54eea9e14c2ef1730d8e4f29c4bb27c2e17ff1923e9e982b2075195663c7fe03224e59851369b730e94c2dd1711732f09082a6ecd470a603b28a5660be161d41 WHIRLPOOL 7bfab6c1ba2ccaab1fa77eb5d8fcd9b8a964e424bdce25f19756b1d77b6665b12050a773c2b2200633b05d67f6dd21e3c31ee320fdb20340a1cdc8a98a084e53
-EBUILD sabnzbd-0.7.13-r2.ebuild 3200 SHA256 b99a29487a00647719e6776bc886a67c94af2c5fbc99e7f303e7b116b04369a5 SHA512 3bd0868834d8b324946ea556cfbbe5a5d9b0f39d80df0d2b58a4f01173466ab5447d9df3660da80a3c744f965c611e3faf2401040509ad6905fa880c28361b1e WHIRLPOOL ad9fc24484bb74749a9d99bf75b666cbc2639b902dae1d120a6798390e6d322bf021e287d5d62fc63dda65b578292f6e5ca74296640e670ddf0e478af7a9218c
-EBUILD sabnzbd-0.7.14.ebuild 3197 SHA256 65a218122d88ebb4adfe380b6027058ee1098f1e66ff1a124e5e83bcde75b747 SHA512 6f2238f1c53e1841b123f179823eb704ae982f0aab026e15a4908069bf6139e1617d5d16695786f5cf4c3761493f73328e2ad0cfe7bbef6ece310de547ae5fe9 WHIRLPOOL 9ada7782955456b955f1c1d71a60ca4c99d3db0f4fbc2dc76f51244f3d50f281e591e92b8178c828ba2e02f624e1d801edf5b87bf2534b0b131542f961d18c3f
-MISC ChangeLog 3231 SHA256 a53b8a2967363dcaa887a32bc5b8e79486011739763c5bfa8a89c2b2a230f0bc SHA512 2f84f4a5576a16226bcbff9bf72ded5a2b31e652bef82fd67d55d0f850feb5aee9179103335cb0dd3a300c4ccf03e0df2337d2d57ad368342fb6cfc4b8ff6d78 WHIRLPOOL 8156b146cde796a6b764e208254149d0290e6bea432779ef4ba8de9fcd1841617bdcce5a426a90f5b6d959c29cc3191e99d54a7f595ccb390657c82126f0b674
+DIST SABnzbd-0.7.16-src.tar.gz 2275768 SHA256 2c50496c8be81ac4498944a5209b2c6b3bdfecc48cf4e0df54552c5d985e5772 SHA512 ae97f093c34a100ab92949eb25a48db4c7d7d06c1fc082d3e8390d84e15dbdbbe4e682f47532cb84571039caab9aed377957522fa07b6a0f49c368eb77d66144 WHIRLPOOL 470f300f9f7b5f833d14c8170aee8690cddcfb9e442c3d9a6d108b155d6b2f7afab19010a7bf650c31e4ade5ca680433245a9c226948b52d8301861f5dc35965
+EBUILD sabnzbd-0.7.16.ebuild 3166 SHA256 ed3a7d90ccf46bb69119a2cb2125a860c05e7086f1ba522f776524b189a88277 SHA512 e94d0d17ec4527e0a38173921700181f22362ed583c0beaca5360bc416f9d71688ca41de1c9550e6c42bd9d43bb28f04fcee691b553fa1e9f4fc090d331b5c49 WHIRLPOOL 119ec7897d6bd89651771fb134890a72adefa22708e37a3a2dfd7ee64c81e04eed8557ef93221d1f2de3135dfbfe88781209d2d03424b4b7cdf92c4eabfff163
+MISC ChangeLog 3666 SHA256 138078a5d8720021acab12550b14e2f01aa2767a7b2cdce98598ae59f9dc0e0b SHA512 84d885a648c68525a25f0b78724e5b4272dfbc5a3901138ed3641f2cf48b5d4a13ff184c51356291471d325a5d35940ee530068e426c7e0438e18cafc22da71f WHIRLPOOL d1ebae1d6b301c25bfc63cdbcf1a53c3d7bfdc0a714c91bcdc794bc22a5801ba780073262a69f51bc618e3a85502763e6e69367c177b4417a37c5733ffdbfb99
 MISC metadata.xml 484 SHA256 8e26c45345b47dbcdd018d9006a4d7f42a1394da6e39e9e968b1362480ae5d7a SHA512 18630bf4e3afa57977c1c4d7f562888c3048c3778a9aff4bba2e969f3f1934d8f85c22fef30c453f5ea09f410ce16761b75c25ba7d73ce1a14ea4abffcd918a6 WHIRLPOOL a399aa5a061fba0278117af2c8e18f88bb8cb10e049ff0cc9d86d9316497dcc5c13e55ceeea03b848ab4f796665e6efa0fc3345c02a4dcbbaacdef782ab7cc2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIsimQACgkQVWmRsqeSphMZSgCdHjFrq06kkBtqlNTTLQC3N7z6
-UY0An3TGSh7FV+yWghNNkjBQIdVvvlfZ
-=REHo
+iEYEAREIAAYFAlJUkw0ACgkQ4MrvBE1wQ8kWzQCgkEoTT/3XLJhynCKKCXDi+rDx
+fjwAnRs4FjDNbQdXkKMiK0beR1VCDIcz
+=veoq
 -----END PGP SIGNATURE-----
diff --git a/net-nntp/sabnzbd/files/par2cmdline.patch b/net-nntp/sabnzbd/files/par2cmdline.patch
new file mode 100644
index 000000000000..d5648eb57aea
--- /dev/null
+++ b/net-nntp/sabnzbd/files/par2cmdline.patch
@@ -0,0 +1,12 @@
+--- sabnzbd/newsunpack.py.orig  2013-07-07 13:29:12.000000000 +0200
++++ sabnzbd/newsunpack.py  2013-08-02 20:16:22.286697000 +0200
+@@ -966,7 +966,7 @@
+ 
+     # Append the wildcard for this set
+     wildcard = '%s*' % os.path.join(os.path.split(parfile)[0], setname)
+-    if single or len(globber(wildcard, None)) < 2:
++    if len(globber(wildcard, None)) < 2:
+         # Support bizarre naming conventions
+         wildcard = os.path.join(os.path.split(parfile)[0], '*')
+     command.append(wildcard) 
+
diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd b/net-nntp/sabnzbd/files/sabnzbd.initd
index 97c6b69c5d00..576c403dff1f 100644
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -1,7 +1,6 @@
 #!/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.5 2013/06/25 03:48:26 jsbronder Exp $
 
 RUNDIR=/var/run/sabnzbd
 
@@ -9,6 +8,40 @@ depend() {
     need net
 }
 
+get_var() {
+    echo $(sed -n \
+        '/\[misc]/,/^'$1'/ s/^'$1' = \([[:alnum:].]\+\)[\r|\n|\r\n]*$/\1/p' \
+        ${SABNZBD_CONFIGFILE})
+}
+
+get_port() {
+    if [ "$(get_var 'enable_https')" == "1" ]; then
+        echo $(get_var 'https_port')
+    else
+        echo $(get_var 'port')
+    fi
+}
+
+get_addr() {
+    local host=$(get_var 'host')
+    local port=$(get_port)
+    local protocol
+
+    [ "${host}" == "0.0.0.0" ] && host=localhost
+    if [ "$(get_var 'enable_https')" == "1" ]; then
+        protocol="https"
+    else
+        protocol="http"
+    fi
+
+    echo ${protocol}://${host}:${port}
+}
+
+get_pidfile() {
+    local port=$(get_port)
+    echo "${RUNDIR}/sabnzbd-${port}.pid"
+}
+
 start() {
     ebegin "Starting SABnzbd"
 
@@ -20,76 +53,49 @@ start() {
         --user ${SABNZBD_USER} \
         --group ${SABNZBD_GROUP} \
         --name sabnzbd \
+        --background \
         --pidfile $(get_pidfile) \
         --exec /usr/bin/sabnzbd \
         -- \
         --config-file ${SABNZBD_CONFIGFILE} \
         --logging ${SABNZBD_LOGGING} \
         --daemon \
-        --pid "${RUNDIR}"
+        --pid ${RUNDIR}
 
     eend $?
 }
 
-get_var() {
-    echo $(echo $(grep "^$1" ${SABNZBD_CONFIGFILE} | head -n 1 | sed 's/\r//' | awk '{print $3}'))
-}
-
-get_pidfile () {
-    # pid file name is hard-coded in sabnzbd, this must match
-    local ssl=$(get_var 'enable_https')
-
-    if [ -z "${ssl}" ]; then
-        echo "${RUNDIR}/sabnzbd-8080.pid"
-    elif [ ${ssl} -eq 0 ]; then
-        echo "${RUNDIR}/sabnzbd-$(get_var 'port').pid"
-    else
-        echo "${RUNDIR}/sabnzbd-$(get_var 'https_port').pid"
-    fi
-}
-
-get_addr() {
-    local host=$(get_var 'host')
-    #local ssl=$(get_var 'enable_https')
-    #local ssl_port=$(get_var 'https_port')
-    local port=$(get_var 'port')
-
-    if [ "${host}" == "0.0.0.0" ]; then
-        host=localhost
+start_pre() {
+    if [ "$RC_CMD" == "restart" ]; then
+        local pidfile=$(get_pidfile)
+        while [ -e ${pidfile} ]; do
+            sleep 1
+        done
     fi
 
-    # sabnzbd seems to only respond correctly to non ssl requests
-    echo ${host}:${port}
+    return 0
 }
 
 stop() {
     local api_key=$(get_var 'api_key')
-    local rc t
-
-    ebegin "Stopping SABnzbd @ $(get_addr)"
+    local addr=$(get_addr)
+    local pidfile=$(get_pidfile)
+    local rc=1
 
-    /usr/bin/wget -q --delete-after --no-check-certificate \
-        "http://$(get_addr)/sabnzbd/api?mode=shutdown&apikey=${api_key}"
-    rc=$?
+    ebegin "Stopping SABnzbd @ ${addr}"
 
-    if [ ${rc} -eq 0 ]; then
-        # Wait for sabnzbd to fully shutdown.
-        for ((t=0; t < 30; t++)); do
-            sleep 0.5
-            [ ! -s $(get_pidfile) ] && break
-        done
-    fi
-
-    if [ -s $(get_pidfile) ]; then
-        # Using wget didn't work, resort to start-stop-daemon
+    # SABnzbd will return "ok" if shutdown is successful
+    rc=$(/usr/bin/curl -k -s "${addr}/sabnzbd/api?mode=shutdown&apikey=${api_key}")
+    if [ "${rc}" == "ok" ]; then
+		rc=0
+	else
         einfo "Falling back to SIGTERM, this may not work if you restarted via the web interface"
         start-stop-daemon \
             --stop \
-            --pidfile $(get_pidfile) \
+            --pidfile ${pidfile} \
             --retry SIGTERM/1/SIGKILL/5
         rc=$?
     fi
 
     eend ${rc}
 }
-
diff --git a/net-nntp/sabnzbd/files/sabnzbd.logrotate b/net-nntp/sabnzbd/files/sabnzbd.logrotate
deleted file mode 100644
index 3910e33fd649..000000000000
--- a/net-nntp/sabnzbd/files/sabnzbd.logrotate
+++ /dev/null
@@ -1,13 +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/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.13-r2.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.13-r2.ebuild
deleted file mode 100644
index 5974d5f05ba3..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-0.7.13-r2.ebuild
+++ /dev/null
@@ -1,119 +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.13-r2.ebuild,v 1.1 2013/06/25 03:48:26 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}
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-0.7.14.ebuild b/net-nntp/sabnzbd/sabnzbd-0.7.16.ebuild
index 4e03ff18dfd9..7700f353f210 100644
--- a/net-nntp/sabnzbd/sabnzbd-0.7.14.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-0.7.16.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.14.ebuild,v 1.1 2013/07/11 23:08:10 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/sabnzbd-0.7.16.ebuild,v 1.1 2013/10/08 23:19:35 jsbronder Exp $
 
 EAPI="4"
 
@@ -65,6 +65,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/use-system-configobj-and-feedparser.patch
 	epatch "${FILESDIR}"/growler-support-gntp-1.0.patch
+	epatch "${FILESDIR}"/par2cmdline.patch
 
 	# remove bundled modules
 	rm -r sabnzbd/utils/{feedparser,configobj}.py || die
@@ -89,9 +90,6 @@ 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}