From 0245edac02246e3a6ace4162546a4e286e5f7044 Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Wed, 23 Sep 2015 16:48:50 -0400 Subject: [PATCH] net-voip/yate: fix init script, bug #547346 --- net-voip/yate/files/yate.initd | 8 ++++---- net-voip/yate/{yate-5.4.0.ebuild => yate-5.4.0-r1.ebuild} | 2 ++ net-voip/yate/{yate-5.5.0.ebuild => yate-5.5.0-r1.ebuild} | 2 ++ .../{yatebts-4.0.0-r2.ebuild => yatebts-4.0.0-r3.ebuild} | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) rename net-voip/yate/{yate-5.4.0.ebuild => yate-5.4.0-r1.ebuild} (96%) rename net-voip/yate/{yate-5.5.0.ebuild => yate-5.5.0-r1.ebuild} (96%) rename net-wireless/yatebts/{yatebts-4.0.0-r2.ebuild => yatebts-4.0.0-r3.ebuild} (97%) diff --git a/net-voip/yate/files/yate.initd b/net-voip/yate/files/yate.initd index 01f07f4a538d..8c3e402ca016 100644 --- 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 6f90ed04c9d5..4e5524e43b42 100644 --- 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 6f90ed04c9d5..4e5524e43b42 100644 --- 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 ed833fb33494..11eb1cb823e8 100644 --- 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" -- 2.26.2