[gentoo-commits] repo/gentoo:master commit in: net-nntp/sabnzbd/, net-nntp/sabnzbd/files/

[Justin Bronder]

commit:     23150df6ad2364e1d4de4438f8ef1379c20257c9
Author:     Michał Kępień <github <AT> kempniu <DOT> pl>
AuthorDate: Fri Nov 18 20:02:05 2016 +0000
Commit:     Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 16:33:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23150df6

Drop custom wrapper script

 net-nntp/sabnzbd/files/sabnzbd        | 14 --------------
 net-nntp/sabnzbd/files/sabnzbd.initd  |  2 +-
 net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild | 10 ++++------
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/net-nntp/sabnzbd/files/sabnzbd b/net-nntp/sabnzbd/files/sabnzbd
deleted file mode 100644
index ccc1a67..00000000
--- a/net-nntp/sabnzbd/files/sabnzbd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-pyexe=python2.7
-
-if [ ! -x /usr/bin/${pyexe} ]; then
-    pyexe=python2.6
-fi
-
-if [ ! -x /usr/bin/${pyexe} ]; then
-    echo "No suitable python executable found in /usr/sbin (python2.6 || 
python2.7)"
-    exit 1
-fi
-
-cd /usr/share/sabnzbd && /usr/bin/${pyexe} SABnzbd.py $*

diff --git a/net-nntp/sabnzbd/files/sabnzbd.initd 
b/net-nntp/sabnzbd/files/sabnzbd.initd
index ad11573..a2a8407 100755
--- a/net-nntp/sabnzbd/files/sabnzbd.initd
+++ b/net-nntp/sabnzbd/files/sabnzbd.initd
@@ -24,7 +24,7 @@ start() {
                --group ${SABNZBD_GROUP} \
                --pidfile "${PIDFILE}" \
                --wait 1000 \
-               --exec /usr/bin/sabnzbd \
+               --exec /usr/share/sabnzbd/SABnzbd.py \
                -- \
                --config-file "${SABNZBD_CONFIGFILE}" \
                --logging "${SABNZBD_LOGGING}" \

diff --git a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild 
b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
index 120ac64..d013e87 100644
--- a/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-1.1.1.ebuild
@@ -79,17 +79,15 @@ src_prepare() {
 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
 
+       insinto /usr/share/${PN}
+       insopts -m 0755
+       doins SABnzbd.py
+
        python_optimize "${D}usr/share/${PN}"
 
        newinitd "${FILESDIR}/${PN}.initd" "${PN}"