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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2D2C158089 for ; Thu, 28 Sep 2023 15:51:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E491E2BC017; Thu, 28 Sep 2023 15:51:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CAD302BC017 for ; Thu, 28 Sep 2023 15:51:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFEA5335C7A for ; Thu, 28 Sep 2023 15:51:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08EA31147 for ; Thu, 28 Sep 2023 15:51:06 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1695916240.cf61e72bf2286399797f87cab4e45aa2d7b7e92e.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/depend.apache.eclass X-VCS-Directories: eclass/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: cf61e72bf2286399797f87cab4e45aa2d7b7e92e X-VCS-Branch: master Date: Thu, 28 Sep 2023 15:51:06 +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: a38a9f2b-3965-43bc-9cfc-f0c64e57f62d X-Archives-Hash: 9ea89fb81d0dcaa2e25127820631a4a2 commit: cf61e72bf2286399797f87cab4e45aa2d7b7e92e Author: Hans de Graaff gentoo org> AuthorDate: Sun Sep 24 08:28:53 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Thu Sep 28 15:50:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf61e72b eclass/depend.apache: drop support for EAPI 0-5 Signed-off-by: Hans de Graaff gentoo.org> eclass/depend.apache.eclass | 60 +++++++++------------------------------------ 1 file changed, 12 insertions(+), 48 deletions(-) diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 51410265bbc5..4dc3f68daabc 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: depend.apache.eclass # @MAINTAINER: # apache-bugs@gentoo.org -# @SUPPORTED_EAPIS: 0 2 3 4 5 6 7 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: Functions to allow ebuilds to depend on apache # @DESCRIPTION: # This eclass handles depending on apache in a sane way and provides information @@ -41,9 +41,6 @@ # @CODE case ${EAPI:-0} in - 0|2|3|4|5) - inherit multilib - ;; 6|7) ;; *) @@ -78,8 +75,7 @@ esac # @ECLASS_VARIABLE: APACHE_BASEDIR # @DESCRIPTION: # Path to the server root directory. -# This variable is set by the want/need_apache functions (EAPI=0 through 5) -# or depend.apache_pkg_setup (EAPI=6 and later). +# This variable is set by depend.apache_pkg_setup. # @ECLASS_VARIABLE: APACHE_CONFDIR # @DESCRIPTION: @@ -99,8 +95,7 @@ esac # @ECLASS_VARIABLE: APACHE_MODULESDIR # @DESCRIPTION: # Path where we install modules. -# This variable is set by the want/need_apache functions (EAPI=0 through 5) -# or depend.apache_pkg_setup (EAPI=6 and later). +# This variable is set by depend.apache_pkg_setup. # @ECLASS_VARIABLE: APACHE_DEPEND # @DESCRIPTION: @@ -140,12 +135,6 @@ _init_apache2() { APACHE_CONFDIR="/etc/apache2" APACHE_MODULES_CONFDIR="${APACHE_CONFDIR}/modules.d" APACHE_VHOSTS_CONFDIR="${APACHE_CONFDIR}/vhosts.d" - - case ${EAPI:-0} in - 0|2|3|4|5) - _init_apache2_late - ;; - esac } _init_apache2_late() { @@ -177,27 +166,14 @@ depend.apache_pkg_setup() { local myiuse=${1:-apache2} - case ${EAPI:-0} in - 0|2|3|4|5) - if has ${myiuse} ${IUSE}; then - if use ${myiuse}; then - _init_apache2 - else - _init_no_apache - fi - fi - ;; - *) - if in_iuse ${myiuse}; then - if use ${myiuse}; then - _init_apache2 - _init_apache2_late - else - _init_no_apache - fi - fi - ;; - esac + if in_iuse ${myiuse}; then + if use ${myiuse}; then + _init_apache2 + _init_apache2_late + else + _init_no_apache + fi + fi } # @FUNCTION: want_apache @@ -327,12 +303,6 @@ has_apache() { has_apache_threads() { debug-print-function $FUNCNAME $* - case ${EAPI:-0} in - 0|1) - die "depend.apache.eclass: has_apache_threads is not supported for EAPI=${EAPI:-0}" - ;; - esac - if ! has_version 'www-servers/apache[threads]'; then return fi @@ -356,12 +326,6 @@ has_apache_threads() { has_apache_threads_in() { debug-print-function $FUNCNAME $* - case ${EAPI:-0} in - 0|1) - die "depend.apache.eclass: has_apache_threads_in is not supported for EAPI=${EAPI:-0}" - ;; - esac - if ! has_version 'www-servers/apache[threads]'; then return fi