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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A3F5158089 for ; Sun, 24 Sep 2023 10:45:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61B102BC01A; Sun, 24 Sep 2023 10:45:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 1B9742BC013 for ; Sun, 24 Sep 2023 10:45:53 +0000 (UTC) Message-ID: Subject: Re: [gentoo-dev] [PATCH] eclass/depend.apache: drop support for EAPI 0-5 From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: Hans de Graaff Date: Sun, 24 Sep 2023 12:45:47 +0200 In-Reply-To: <20230924083509.24547-1-graaff@gentoo.org> References: <20230924083509.24547-1-graaff@gentoo.org> Autocrypt: addr=soap@gentoo.org; prefer-encrypt=mutual; keydata=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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.0 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 X-Archives-Salt: c216614c-b0c9-4ddf-b535-ef7f94a36cd0 X-Archives-Hash: 3b60de473eaaaf1ddb08af486c9168b8 On Sun, 2023-09-24 at 10:35 +0200, Hans de Graaff wrote: > Signed-off-by: Hans de Graaff > --- > =C2=A0eclass/depend.apache.eclass | 60 ++++++++--------------------------= -- > - > =C2=A01 file changed, 12 insertions(+), 48 deletions(-) >=20 > 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 > =C2=A0# Distributed under the terms of the GNU General Public License v2 > =C2=A0 > =C2=A0# @ECLASS: depend.apache.eclass > =C2=A0# @MAINTAINER: > =C2=A0# apache-bugs@gentoo.org > -# @SUPPORTED_EAPIS: 0 2 3 4 5 6 7 > +# @SUPPORTED_EAPIS: 6 7 > =C2=A0# @BLURB: Functions to allow ebuilds to depend on apache > =C2=A0# @DESCRIPTION: > =C2=A0# This eclass handles depending on apache in a sane way and provide= s > information > @@ -41,9 +41,6 @@ > =C2=A0# @CODE > =C2=A0 > =C2=A0case ${EAPI:-0} in > - 0|2|3|4|5) > - inherit multilib > - ;; > =C2=A0 6|7) > =C2=A0 ;; > =C2=A0 *) > @@ -78,8 +75,7 @@ esac > =C2=A0# @ECLASS_VARIABLE: APACHE_BASEDIR > =C2=A0# @DESCRIPTION: > =C2=A0# Path to the server root directory. > -# This variable is set by the want/need_apache functions (EAPI=3D0 > through 5) > -# or depend.apache_pkg_setup (EAPI=3D6 and later). > +# This variable is set by depend.apache_pkg_setup. > =C2=A0 > =C2=A0# @ECLASS_VARIABLE: APACHE_CONFDIR > =C2=A0# @DESCRIPTION: > @@ -99,8 +95,7 @@ esac > =C2=A0# @ECLASS_VARIABLE: APACHE_MODULESDIR > =C2=A0# @DESCRIPTION: > =C2=A0# Path where we install modules. > -# This variable is set by the want/need_apache functions (EAPI=3D0 > through 5) > -# or depend.apache_pkg_setup (EAPI=3D6 and later). > +# This variable is set by depend.apache_pkg_setup. > =C2=A0 > =C2=A0# @ECLASS_VARIABLE: APACHE_DEPEND > =C2=A0# @DESCRIPTION: > @@ -140,12 +135,6 @@ _init_apache2() { > =C2=A0 APACHE_CONFDIR=3D"/etc/apache2" > =C2=A0 APACHE_MODULES_CONFDIR=3D"${APACHE_CONFDIR}/modules.d" > =C2=A0 APACHE_VHOSTS_CONFDIR=3D"${APACHE_CONFDIR}/vhosts.d" > - > - case ${EAPI:-0} in > - 0|2|3|4|5) > - _init_apache2_late > - ;; > - esac > =C2=A0} > =C2=A0 > =C2=A0_init_apache2_late() { > @@ -177,27 +166,14 @@ depend.apache_pkg_setup() { > =C2=A0 > =C2=A0 local myiuse=3D${1:-apache2} > =C2=A0 > - 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 > =C2=A0} > =C2=A0 > =C2=A0# @FUNCTION: want_apache > @@ -327,12 +303,6 @@ has_apache() { > =C2=A0has_apache_threads() { > =C2=A0 debug-print-function $FUNCNAME $* > =C2=A0 > - case ${EAPI:-0} in > - 0|1) > - die "depend.apache.eclass: has_apache_threads > is not supported for EAPI=3D${EAPI:-0}" > - ;; > - esac > - > =C2=A0 if ! has_version 'www-servers/apache[threads]'; then > =C2=A0 return > =C2=A0 fi > @@ -356,12 +326,6 @@ has_apache_threads() { > =C2=A0has_apache_threads_in() { > =C2=A0 debug-print-function $FUNCNAME $* > =C2=A0 > - case ${EAPI:-0} in > - 0|1) > - die "depend.apache.eclass: > has_apache_threads_in is not supported for EAPI=3D${EAPI:-0}" > - ;; > - esac > - > =C2=A0 if ! has_version 'www-servers/apache[threads]'; then > =C2=A0 return > =C2=A0 fi LGTM