[gentoo-commits] repo/gentoo:master commit in: eclass/

[Lars Wendler]

commit:     1d4bc2b25535cfa51a98dec292f6235ee7190256
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  1 13:50:22 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Oct  1 14:07:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4bc2b2

apache-2.eclass: Drop apache-2.2 specific code

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 eclass/apache-2.eclass | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/eclass/apache-2.eclass b/eclass/apache-2.eclass
index 886161758a3..ff6ed9eafb1 100644
--- a/eclass/apache-2.eclass
+++ b/eclass/apache-2.eclass
@@ -28,10 +28,6 @@ case $(ver_cut 1-2) in
                CDEPEND=">=dev-libs/apr-1.5.1:=
                        !www-apache/mod_macro" #492578 #477702
        ;;
-       2.2)
-               DEFAULT_MPM_THREADED="worker"
-               CDEPEND=">=dev-libs/apr-1.4.5:=" #368651
-       ;;
        *)
                die "Unknown MAJOR.MINOR apache version."
        ;;
@@ -120,9 +116,7 @@ _apache2_set_mpms() {
                REQUIRED_USE+=" )"
        done
 
-       if [[ "$(ver_cut 1-2)" != 2.2 ]] ; then
-               REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 
)"
-       fi
+       REQUIRED_USE+=" apache2_mpms_prefork? ( !apache2_modules_http2 )"
 }
 _apache2_set_mpms
 unset -f _apache2_set_mpms