commit:     315047e745e9210b9279845aaae12931e2cceebe
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 08:11:26 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 08:11:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315047e7

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 33b478d..add07dc 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 fc9146e..2323b63 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 \

Reply via email to