From: Anthony G. Basile <blueness@gentoo.org>
Date: Fri, 14 Aug 2015 00:48:28 +0000 (-0400)
Subject: www-servers/monkeyd: don't install into /run
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9dfe176869d8c1c3f0c9953a3162bb0c8ca69bb;p=gentoo.git

www-servers/monkeyd: don't install into /run

Package-Manager: portage-2.2.20.1
---

diff --git a/www-servers/monkeyd/files/monkeyd.initd-r1 b/www-servers/monkeyd/files/monkeyd.initd-r1
index d1fb73038baf..e3ca111eb907 100644
--- a/www-servers/monkeyd/files/monkeyd.initd-r1
+++ b/www-servers/monkeyd/files/monkeyd.initd-r1
@@ -12,6 +12,8 @@ depend() {
 
 start() {
 	ebegin "Starting monkeyd"
+	local PIDFILE=$(awk '/^ *PidFile/ { print $2 }' "${CONFFILE}")
+	mkdir -p $(dirname ${PIDFILE})
 	start-stop-daemon --start --exec "${DAEMON}" -- "-D" "${MONKEY_ARGS}" >/dev/null
 	eend $?
 }
diff --git a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
index d07b3b808783..59f80a4f519e 100644
--- a/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild
@@ -118,7 +118,7 @@ src_install() {
 	newinitd "${FILESDIR}"/monkeyd.initd-r1 monkeyd
 	newconfd "${FILESDIR}"/monkeyd.confd monkeyd
 
-	#move htdocs to docdir, bug #429632
+	# Move htdocs to docdir, bug #429632
 	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
 	mv "${D}"${WEBROOT}/htdocs \
 		"${D}"/usr/share/doc/"${PF}"/htdocs.dist
@@ -127,4 +127,7 @@ src_install() {
 	keepdir \
 		/var/log/monkeyd \
 		${WEBROOT}/htdocs
+
+	# This needs to be created at runtime
+	rm -rf "${D}"/run
 }