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 A0B66158089 for ; Fri, 29 Sep 2023 06:41:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3435E2BC02B; Fri, 29 Sep 2023 06:41:18 +0000 (UTC) Received: from graaff.moving-innovations.com (graaff.connected.by.freedominter.net [45.137.101.13]) by pigeon.gentoo.org (Postfix) with ESMTP id 59D5F2BC022 for ; Fri, 29 Sep 2023 06:41:16 +0000 (UTC) Received: by graaff.moving-innovations.com (Postfix, from userid 1000) id 335ED834B6; Fri, 29 Sep 2023 08:41:16 +0200 (CEST) From: Hans de Graaff To: gentoo-dev@lists.gentoo.org Cc: Hans de Graaff Subject: [gentoo-dev] [PATCH 1/4] eclass/depend.apache: deprecate apache 2.2 methods Date: Fri, 29 Sep 2023 08:40:59 +0200 Message-ID: <20230929064102.27186-1-graaff@gentoo.org> X-Mailer: git-send-email 2.41.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 Content-Transfer-Encoding: 8bit X-Archives-Salt: 2c547729-3648-404c-9b5c-fa4af0a51849 X-Archives-Hash: 7af9165d6445d9c11572f04e00de0818 www-servers/apache-2.2 has been removed in 2019. --- eclass/depend.apache.eclass | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/eclass/depend.apache.eclass b/eclass/depend.apache.eclass index 4dc3f68daabc..4d1ca573611b 100644 --- a/eclass/depend.apache.eclass +++ b/eclass/depend.apache.eclass @@ -109,7 +109,7 @@ APACHE2_DEPEND="=www-servers/apache-2*" # @ECLASS_VARIABLE: APACHE2_2_DEPEND # @DESCRIPTION: -# Dependencies for Apache 2.2.x +# Dependencies for Apache 2.2.x. Deprecated and removed in EAPI 8. APACHE2_2_DEPEND="=www-servers/apache-2.2*" # @ECLASS_VARIABLE: APACHE2_4_DEPEND @@ -215,10 +215,17 @@ want_apache2() { want_apache2_2() { debug-print-function $FUNCNAME $* - local myiuse=${1:-apache2} - IUSE="${IUSE} ${myiuse}" - DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" - RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" + case ${EAPI:-0} in + 6|7) + local myiuse=${1:-apache2} + IUSE="${IUSE} ${myiuse}" + DEPEND="${DEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" + RDEPEND="${RDEPEND} ${myiuse}? ( ${APACHE2_2_DEPEND} )" + ;; + *) + errror "want-apache2_2 is no longer supported in EAPI 8" + ;; + esac } # @FUNCTION: want_apache2_4 @@ -263,9 +270,16 @@ need_apache2() { need_apache2_2() { debug-print-function $FUNCNAME $* - DEPEND="${DEPEND} ${APACHE2_2_DEPEND}" - RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}" - _init_apache2 + case ${EAPI:-0} in + 6|7) + DEPEND="${DEPEND} ${APACHE2_2_DEPEND}" + RDEPEND="${RDEPEND} ${APACHE2_2_DEPEND}" + _init_apache2 + ;; + *) + error "need_apache2-2 is no longer supported in EAPI 8" + ;; + esac } # @FUNCTION: need_apache2_4 -- 2.41.0