From e96ddc60afd9b8ffb0f2dff37d0690f053ddfb73 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki Date: Sat, 9 Jul 2022 22:43:53 +0200 Subject: [PATCH] eclass/apache-2.eclass: migrate to GLEP-81 Bug: https://bugs.gentoo.org/802495 Signed-off-by: Conrad Kostecki --- eclass/apache-2.eclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass index f59030f926f5e..df2019cd09df5 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