Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 01 Oct 2020 14:07:41
Message-Id: 1601561253.1d4bc2b25535cfa51a98dec292f6235ee7190256.polynomial-c@gentoo
1 commit: 1d4bc2b25535cfa51a98dec292f6235ee7190256
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 1 13:50:22 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 1 14:07:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4bc2b2
7
8 apache-2.eclass: Drop apache-2.2 specific code
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 eclass/apache-2.eclass | 8 +-------
13 1 file changed, 1 insertion(+), 7 deletions(-)
14
15 diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
16 index 886161758a3..ff6ed9eafb1 100644
17 --- a/eclass/apache-2.eclass
18 +++ b/eclass/apache-2.eclass
19 @@ -28,10 +28,6 @@ case $(ver_cut 1-2) in
20 CDEPEND=">=dev-libs/apr-1.5.1:=
21 !www-apache/mod_macro" #492578 #477702
22 ;;
23 - 2.2)
24 - DEFAULT_MPM_THREADED="worker"
25 - CDEPEND=">=dev-libs/apr-1.4.5:=" #368651
26 - ;;
27 *)
28 die "Unknown MAJOR.MINOR apache version."
29 ;;
30 @@ -120,9 +116,7 @@ _apache2_set_mpms() {
31 REQUIRED_USE+=" )"
32 done
33
34 - if [[ "$(ver_cut 1-2)" != 2.2 ]] ; then
35 - REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )"
36 - fi
37 + REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )"
38 }
39 _apache2_set_mpms
40 unset -f _apache2_set_mpms