Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 24 Jul 2021 20:17:07
Message-Id: 1627157728.d7f7d8a5eeef84e882688c89850db6376b42f766.conikost@gentoo
1 commit: d7f7d8a5eeef84e882688c89850db6376b42f766
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 24 20:07:13 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 24 20:15:28 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7f7d8a5
7
8 Revert "eclass/apache-2.eclass: migrate to GLEP 81"
9
10 This reverts commit 187721bffbea19bc37969fb70de400a391171611.
11
12 Bug: https://bugs.gentoo.org/802495
13 Bug: https://bugs.gentoo.org/803500
14 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
15
16 eclass/apache-2.eclass | 8 +++++---
17 1 file changed, 5 insertions(+), 3 deletions(-)
18
19 diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
20 index 3da388952c4..a67597447ba 100644
21 --- a/eclass/apache-2.eclass
22 +++ b/eclass/apache-2.eclass
23 @@ -10,7 +10,7 @@
24 # This eclass handles apache-2.x ebuild functions such as LoadModule generation
25 # and inter-module dependency checking.
26
27 -inherit autotools flag-o-matic multilib ssl-cert toolchain-funcs
28 +inherit autotools flag-o-matic multilib ssl-cert user toolchain-funcs
29
30 [[ ${CATEGORY}/${PN} != www-servers/apache ]] \
31 && die "Do not use this eclass with anything else than www-servers/apache ebuilds!"
32 @@ -136,8 +136,6 @@ unset -f _apache2_set_mpms
33
34 # Dependencies
35 RDEPEND="
36 - acct-group/apache
37 - acct-user/apache
38 dev-lang/perl
39 >=dev-libs/apr-1.5.1:=
40 =dev-libs/apr-util-1*:=[gdbm=,ldap?]
41 @@ -437,6 +435,10 @@ check_upgrade() {
42 apache-2_pkg_setup() {
43 check_upgrade
44
45 + # setup apache user and group
46 + enewgroup apache 81
47 + enewuser apache 81 -1 /var/www apache
48 +
49 setup_mpm
50 setup_modules