commit:     187721bffbea19bc37969fb70de400a391171611
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 19:06:08 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Jul 22 19:28:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=187721bf

eclass/apache-2.eclass: migrate to GLEP 81

Bug: https://bugs.gentoo.org/802495
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 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 a67597447ba..3da388952c4 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -10,7 +10,7 @@
 # This eclass handles apache-2.x ebuild functions such as LoadModule generation
 # and inter-module dependency checking.
 
-inherit autotools flag-o-matic multilib ssl-cert user toolchain-funcs
+inherit autotools flag-o-matic multilib ssl-cert toolchain-funcs
 
 [[ ${CATEGORY}/${PN} != www-servers/apache ]] \
        && die "Do not use this eclass with anything else than 
www-servers/apache ebuilds!"
@@ -136,6 +136,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?]
@@ -435,10 +437,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
 

Reply via email to