www-servers/monkeyd: minor cleanups to the ebuild.

Package-Manager: portage-2.2.20.1

diff --git a/www-servers/monkeyd/monkeyd-1.6.4.ebuild b/www-servers/monkeyd/monkeyd-1.6.4.ebuild
index 33b478d934a9163a09d1a8a2987dd9442e4b2e28..add07dc76ee8cd2f0fabc0d88bbca0a2eccc8516 100644 (file)
--- 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 fc9146ee2746a32aa98a4737351491e73ca864ac..2323b63db94be93deabea924cd99503ef9b249cf 100644 (file)
--- 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 \