net-voip/yate: fix init script, bug #547346

diff --git a/net-voip/yate/files/yate.initd b/net-voip/yate/files/yate.initd
index 01f07f4a538d51477d7ddca67e3566e43e797383..8c3e402ca0165a338477cd8a176d7aa68537d589 100644 (file)
--- a/net-voip/yate/files/yate.initd
+++ b/net-voip/yate/files/yate.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-opts="${opts} reload"
+extra_started_commands="reload"
 
 YATE_PIDFILE=${YATE_PIDFILE:-/var/run/${SVCNAME}.pid}
 YATE_BINARY=${YATE_BINARY:-/usr/bin/yate}
@@ -28,7 +28,7 @@ stop() {
 
 reload() {
     ebegin "Reloading ${SVCNAME}"
-    start-stop-daemon --stop --exec "${YATE_BINARY}" \
-                       --pidfile "${YATE_PIDFILE}" --signal HUP --oknodo
+    start-stop-daemon --signal HUP --exec "${YATE_BINARY}" \
+                       --pidfile "${YATE_PIDFILE}"
     eend $?
 }

diff --git a/net-voip/yate/yate-5.4.0.ebuild b/net-voip/yate/yate-5.4.0-r1.ebuild
similarity index 96%
rename from net-voip/yate/yate-5.4.0.ebuild
rename to net-voip/yate/yate-5.4.0-r1.ebuild
index 6f90ed04c9d5f8fbc179f89e082c3f1ec10c871b..4e5524e43b4221fd8d26bee4b42134f7f592e727 100644 (file)
--- a/net-voip/yate/yate-5.4.0.ebuild
+++ b/net-voip/yate/yate-5.4.0-r1.ebuild
@@ -88,4 +88,6 @@ src_install() {
        else
                emake DESTDIR="${ED}" install-noapi
        fi
+       newinitd "${FILESDIR}"/yate.initd yate
+       newconfd "${FILESDIR}"/yate.confd yate
 }

diff --git a/net-voip/yate/yate-5.5.0.ebuild b/net-voip/yate/yate-5.5.0-r1.ebuild
similarity index 96%
rename from net-voip/yate/yate-5.5.0.ebuild
rename to net-voip/yate/yate-5.5.0-r1.ebuild
index 6f90ed04c9d5f8fbc179f89e082c3f1ec10c871b..4e5524e43b4221fd8d26bee4b42134f7f592e727 100644 (file)
--- a/net-voip/yate/yate-5.5.0.ebuild
+++ b/net-voip/yate/yate-5.5.0-r1.ebuild
@@ -88,4 +88,6 @@ src_install() {
        else
                emake DESTDIR="${ED}" install-noapi
        fi
+       newinitd "${FILESDIR}"/yate.initd yate
+       newconfd "${FILESDIR}"/yate.confd yate
 }

diff --git a/net-wireless/yatebts/yatebts-4.0.0-r2.ebuild b/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild
similarity index 97%
rename from net-wireless/yatebts/yatebts-4.0.0-r2.ebuild
rename to net-wireless/yatebts/yatebts-4.0.0-r3.ebuild
index ed833fb33494abedc397160c6a7908e59aaad63d..11eb1cb823e843eda735de9d4f1f7b9f066c9032 100644 (file)
--- a/net-wireless/yatebts/yatebts-4.0.0-r2.ebuild
+++ b/net-wireless/yatebts/yatebts-4.0.0-r3.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="rad1 usrp1 uhd +bladerf cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
 
 RDEPEND="
-       =net-voip/yate-5.4.0:=[gsm]
+       =net-voip/yate-5.4.0-r1:=[gsm]
        bladerf? ( net-wireless/bladerf:= )
        uhd? ( net-wireless/uhd )
        virtual/libusb:1"