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 E19D41581FB for ; Tue, 27 Aug 2024 15:17:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE7DDE2A3D; Tue, 27 Aug 2024 15:16:21 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8BD17E2A2F for ; Tue, 27 Aug 2024 15:16:21 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 06/50] depend.apache.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:14:51 +0200 Message-ID: <20240827151553.210835-6-soap@gentoo.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827151553.210835-1-soap@gentoo.org> References: <20240827151553.210835-1-soap@gentoo.org> 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 Content-Transfer-Encoding: 8bit X-Archives-Salt: 7cf6af77-56fa-43e4-b6e3-f85c3db91bd3 X-Archives-Hash: 325f4bbdfc8e055b2e14ae1ba3806c44 Signed-off-by: David Seifert --- eclass/depend.apache.eclass | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 8f0469931d2c..cc9fb3ee5a5b 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: depend.apache.eclass # @MAINTAINER: # apache-bugs@gentoo.org -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Functions to allow ebuilds to depend on apache # @DESCRIPTION: # This eclass handles depending on apache in a sane way and provides information @@ -40,12 +40,9 @@ # } # @CODE -case ${EAPI:-0} in - 6|7|8) - ;; - *) - die "EAPI=${EAPI} is not supported by depend.apache.eclass" - ;; +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac # ============================================================================== @@ -215,8 +212,8 @@ want_apache2() { want_apache2_2() { debug-print-function $FUNCNAME $* - case ${EAPI:-0} in - 6|7) + case ${EAPI} in + 7) local myiuse=${1:-apache2} IUSE="${IUSE} ${myiuse}" DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" @@ -270,8 +267,8 @@ need_apache2() { need_apache2_2() { debug-print-function $FUNCNAME $* - case ${EAPI:-0} in - 6|7) + case ${EAPI} in + 7) DEPEND="${DEPEND} ${APACHE2_2_DEPEND}" RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}" _init_apache2 -- 2.46.0