From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 1 Sep 2017 22:22:44 +0000 (-0700)
Subject: app-emulation/flannel: revbump to 0.8.0-r2 for bug 629170
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=40f02a0eaee5422f5eeb2b3dd7c7dd5c6b926cd5;p=gentoo.git

app-emulation/flannel: revbump to 0.8.0-r2 for bug 629170

Package-Manager: Portage-2.3.8, Repoman-2.3.2
---

diff --git a/app-emulation/flannel/files/flanneld.initd b/app-emulation/flannel/files/flanneld.initd
index 6f75abd40f53..d5d966a40d30 100644
--- a/app-emulation/flannel/files/flanneld.initd
+++ b/app-emulation/flannel/files/flanneld.initd
@@ -3,11 +3,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 description="Flannel Network Fabric for Containers"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
 user=${user:-root}
 group=${group:-root}
 
-command="/usr/bin/${SVCNAME}"
+command="/usr/bin/${RC_SVCNAME}"
 command_args="${command_args}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
@@ -16,9 +16,4 @@ start_stop_daemon_args="--user ${user} --group ${group} \
 
 depend() {
 	need net
-	after net
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o "${user}":"${group}" "${pidfile%/*}"
 }
diff --git a/app-emulation/flannel/flannel-0.8.0-r1.ebuild b/app-emulation/flannel/flannel-0.8.0-r2.ebuild
similarity index 100%
rename from app-emulation/flannel/flannel-0.8.0-r1.ebuild
rename to app-emulation/flannel/flannel-0.8.0-r2.ebuild