summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conikost@gentoo.org>2022-07-09 22:43:53 +0200
committerConrad Kostecki <conikost@gentoo.org>2022-07-09 23:29:18 +0200
commite96ddc60afd9b8ffb0f2dff37d0690f053ddfb73 (patch)
treeecc17647b0ecc63a89712864c02a47a02a742561 /eclass/apache-2.eclass
parentwww-servers/nginx: migrate to GLEP-81 (diff)
downloadgentoo-e96ddc60afd9b8ffb0f2dff37d0690f053ddfb73.tar.gz
gentoo-e96ddc60afd9b8ffb0f2dff37d0690f053ddfb73.tar.bz2
gentoo-e96ddc60afd9b8ffb0f2dff37d0690f053ddfb73.zip
eclass/apache-2.eclass: migrate to GLEP-81
Bug: https://bugs.gentoo.org/802495 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'eclass/apache-2.eclass')
-rw-r--r--eclass/apache-2.eclass8
1 files changed, 3 insertions, 5 deletions
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