From 315047e745e9210b9279845aaae12931e2cceebe Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Wed, 28 Oct 2015 04:11:26 -0400 Subject: [PATCH] www-servers/monkeyd: minor cleanups to the ebuild. Package-Manager: portage-2.2.20.1 --- www-servers/monkeyd/monkeyd-1.6.4.ebuild | 4 ++-- www-servers/monkeyd/monkeyd-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www-servers/monkeyd/monkeyd-1.6.4.ebuild b/www-servers/monkeyd/monkeyd-1.6.4.ebuild index 33b478d934a9..add07dc76ee8 100644 --- a/www-servers/monkeyd/monkeyd-1.6.4.ebuild +++ b/www-servers/monkeyd/monkeyd-1.6.4.ebuild @@ -84,6 +84,7 @@ src_configure() { use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. + local p for p in ${PLUGINS}; do pp=${p/+/} cp=${pp/monkeyd_plugins_/} @@ -129,8 +130,7 @@ src_install() { # 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 - mkdir "${D}"${WEBROOT}/htdocs + "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die keepdir \ /var/log/monkeyd \ diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild index fc9146ee2746..2323b63db94b 100644 --- a/www-servers/monkeyd/monkeyd-9999.ebuild +++ b/www-servers/monkeyd/monkeyd-9999.ebuild @@ -84,6 +84,7 @@ src_configure() { use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," # For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. + local p for p in ${PLUGINS}; do pp=${p/+/} cp=${pp/monkeyd_plugins_/} @@ -129,8 +130,7 @@ src_install() { # 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 - mkdir "${D}"${WEBROOT}/htdocs + "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die keepdir \ /var/log/monkeyd \ -- 2.26.2