diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36125 -> 36123 bytes | |||
| -rw-r--r-- | eclass/apache-2.eclass | 8 | ||||
| -rw-r--r-- | eclass/ruby-ng.eclass | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex c5554d13fb90..d9c4092eece1 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index f59030f926f5..df2019cd09df 100644 --- a/eclass/apache-2.eclass +++ b/eclass/apache-2.eclass @@ -11,7 +11,7 @@ # and inter-module dependency checking. LUA_COMPAT=( lua5-{1..4} ) -inherit autotools flag-o-matic lua-single multilib ssl-cert user toolchain-funcs +inherit autotools flag-o-matic lua-single multilib ssl-cert toolchain-funcs [[ ${CATEGORY}/${PN} != www-servers/apache ]] \ && die "Do not use this eclass with anything else than www-servers/apache ebuilds!" @@ -133,6 +133,8 @@ unset -f _apache2_set_mpms # Dependencies RDEPEND=" + acct-group/apache + acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] @@ -437,10 +439,6 @@ check_upgrade() { apache-2_pkg_setup() { check_upgrade - # setup apache user and group - enewgroup apache 81 - enewuser apache 81 -1 /var/www apache - setup_mpm setup_modules diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index f0d6c4f6f6c4..c43d5b4d9826 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -410,9 +410,8 @@ _ruby_invoke_environment() { pushd "${WORKDIR}" &>/dev/null || die fi - ebegin "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment" + einfo "Running ${_PHASE:-${EBUILD_PHASE}} phase for $environment" "$@" - eend $? popd &>/dev/null || die S=${old_S} |