[gentoo-commits] repo/gentoo:master commit in: app-admin/serf/, app-admin/serf/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/serf/, app-admin/serf/files/

[Zac Medico]

commit:     04685db032d949f93e0138d513da793e27d078e1
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  1 21:28:55 2017 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Sep  1 21:42:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04685db0

app-admin/serf: revbump to 0.8.1-r1 for bug 628654

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 app-admin/serf/files/serf.initd                           | 15 ++-------------
 .../serf/{serf-0.8.1.ebuild => serf-0.8.1-r1.ebuild}      |  0
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app-admin/serf/files/serf.initd b/app-admin/serf/files/serf.initd
index 3959f312015..042e4f8018a 100644
--- a/app-admin/serf/files/serf.initd
+++ b/app-admin/serf/files/serf.initd
@@ -5,7 +5,7 @@
 description="serf agent"
 extra_started_commands="reload"
 group=${group:-${RC_SVCNAME}}
-pidfile=${pidfile:-"/run/${RC_SVCNAME}/${RC_SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
 user=${user:-${RC_SVCNAME}}
 
 command="/usr/bin/${RC_SVCNAME}"
@@ -14,10 +14,10 @@ command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
 	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+stopsig="SIGINT"
 
 depend() {
 	need net
-	after net
 }
 
 reload() {
@@ -25,14 +25,3 @@ reload() {
 	${command} reload
 	eend $?
 }
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
-}
-
-stop() {
-	# SIGINT is required for graceful shutdown of serf agent
-	ebegin "Stopping ${RC_SVCNAME}"
-	start-stop-daemon --stop --signal SIGINT --pidfile "${pidfile}"
-	eend $?
-}

diff --git a/app-admin/serf/serf-0.8.1.ebuild b/app-admin/serf/serf-0.8.1-r1.ebuild
similarity index 100%
rename from app-admin/serf/serf-0.8.1.ebuild
rename to app-admin/serf/serf-0.8.1-r1.ebuild