[gentoo-commits] repo/gentoo:master commit in: www-servers/monkeyd/, www-servers/monkeyd/files/

[Anthony G. Basile]

commit:     d9dfe176869d8c1c3f0c9953a3162bb0c8ca69bb
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 14 00:48:28 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Aug 14 01:03:08 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9dfe176

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

Package-Manager: portage-2.2.20.1

 www-servers/monkeyd/files/monkeyd.initd-r1  | 2 ++
 www-servers/monkeyd/monkeyd-1.6.0-r1.ebuild | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/www-servers/monkeyd/files/monkeyd.initd-r1 
b/www-servers/monkeyd/files/monkeyd.initd-r1
index d1fb730..e3ca111 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 d07b3b8..59f80a4 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
 }