From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2999138359 for ; Thu, 1 Oct 2020 14:07:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03C31E0824; Thu, 1 Oct 2020 14:07:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF16BE0824 for ; Thu, 1 Oct 2020 14:07:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7F2C33BF43 for ; Thu, 1 Oct 2020 14:07:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C79A380 for ; Thu, 1 Oct 2020 14:07:38 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1601561253.1d4bc2b25535cfa51a98dec292f6235ee7190256.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/apache-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 1d4bc2b25535cfa51a98dec292f6235ee7190256 X-VCS-Branch: master Date: Thu, 1 Oct 2020 14:07:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 37d75647-d869-47fb-a664-a2171f62eaeb X-Archives-Hash: 7289219bfba0d33b4f83e6c4daac1304 commit: 1d4bc2b25535cfa51a98dec292f6235ee7190256 Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 1 13:50:22 2020 +0000 Commit: Lars Wendler gentoo 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 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