From d7f7d8a5eeef84e882688c89850db6376b42f766 Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conikost@gentoo.org>
Date: Sat, 24 Jul 2021 22:07:13 +0200
Subject: Revert "eclass/apache-2.eclass: migrate to GLEP 81"

This reverts commit 187721bffbea19bc37969fb70de400a391171611.

Bug: https://bugs.gentoo.org/802495
Bug: https://bugs.gentoo.org/803500
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 eclass/apache-2.eclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'eclass')

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 3da388952c4c..a67597447ba3 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 toolchain-funcs
+inherit autotools flag-o-matic multilib ssl-cert user toolchain-funcs
 
 [[ ${CATEGORY}/${PN} != www-servers/apache ]] \
 	&& die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
@@ -136,8 +136,6 @@ 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,6 +435,10 @@ 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
 
-- 
cgit v1.2.3-65-gdbad