| 1 |
commit: 315047e745e9210b9279845aaae12931e2cceebe |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 28 08:11:26 2015 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 28 08:11:26 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315047e7 |
| 7 |
|
| 8 |
www-servers/monkeyd: minor cleanups to the ebuild. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
www-servers/monkeyd/monkeyd-1.6.4.ebuild | 4 ++-- |
| 13 |
www-servers/monkeyd/monkeyd-9999.ebuild | 4 ++-- |
| 14 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-servers/monkeyd/monkeyd-1.6.4.ebuild b/www-servers/monkeyd/monkeyd-1.6.4.ebuild |
| 17 |
index 33b478d..add07dc 100644 |
| 18 |
--- a/www-servers/monkeyd/monkeyd-1.6.4.ebuild |
| 19 |
+++ b/www-servers/monkeyd/monkeyd-1.6.4.ebuild |
| 20 |
@@ -84,6 +84,7 @@ src_configure() { |
| 21 |
use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," |
| 22 |
use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," |
| 23 |
# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. |
| 24 |
+ local p |
| 25 |
for p in ${PLUGINS}; do |
| 26 |
pp=${p/+/} |
| 27 |
cp=${pp/monkeyd_plugins_/} |
| 28 |
@@ -129,8 +130,7 @@ src_install() { |
| 29 |
# Move htdocs to docdir, bug #429632 |
| 30 |
docompress -x /usr/share/doc/"${PF}"/htdocs.dist |
| 31 |
mv "${D}"${WEBROOT}/htdocs \ |
| 32 |
- "${D}"/usr/share/doc/"${PF}"/htdocs.dist |
| 33 |
- mkdir "${D}"${WEBROOT}/htdocs |
| 34 |
+ "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die |
| 35 |
|
| 36 |
keepdir \ |
| 37 |
/var/log/monkeyd \ |
| 38 |
|
| 39 |
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild |
| 40 |
index fc9146e..2323b63 100644 |
| 41 |
--- a/www-servers/monkeyd/monkeyd-9999.ebuild |
| 42 |
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild |
| 43 |
@@ -84,6 +84,7 @@ src_configure() { |
| 44 |
use cgi && enable_plugins+="cgi," || disable_plugins+="cgi," |
| 45 |
use fastcgi && enable_plugins+="fastcgi," || disable_plugins+="fastcgi," |
| 46 |
# For the rest, we scan the monkeyd_plugins_* and parse out the plugin name. |
| 47 |
+ local p |
| 48 |
for p in ${PLUGINS}; do |
| 49 |
pp=${p/+/} |
| 50 |
cp=${pp/monkeyd_plugins_/} |
| 51 |
@@ -129,8 +130,7 @@ src_install() { |
| 52 |
# Move htdocs to docdir, bug #429632 |
| 53 |
docompress -x /usr/share/doc/"${PF}"/htdocs.dist |
| 54 |
mv "${D}"${WEBROOT}/htdocs \ |
| 55 |
- "${D}"/usr/share/doc/"${PF}"/htdocs.dist |
| 56 |
- mkdir "${D}"${WEBROOT}/htdocs |
| 57 |
+ "${D}"/usr/share/doc/"${PF}"/htdocs.dist || die |
| 58 |
|
| 59 |
keepdir \ |
| 60 |
/var/log/monkeyd \ |
Archives