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 F2B6A158089 for ; Sun, 8 Oct 2023 10:03:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDC4E2BC0C3; Sun, 8 Oct 2023 10:03:51 +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 C241A2BC0C3 for ; Sun, 8 Oct 2023 10:03:51 +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 BAD3F335D12 for ; Sun, 8 Oct 2023 10:03:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B8C129F1 for ; Sun, 8 Oct 2023 10:03:48 +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: <1696759402.0dcaafc4c96820046d5c3afd7c3da7d148cc4e5b.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: 0dcaafc4c96820046d5c3afd7c3da7d148cc4e5b X-VCS-Branch: master Date: Sun, 8 Oct 2023 10:03:48 +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: a13c88b3-b492-45bb-aa56-5c795445e9ae X-Archives-Hash: 488f1f3d0b547ad2e762505dfab20674 commit: 0dcaafc4c96820046d5c3afd7c3da7d148cc4e5b Author: Hans de Graaff gentoo org> AuthorDate: Fri Sep 29 06:24:29 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Oct 8 10:03:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dcaafc4 eclass/depend.apache: deprecate apache 2.2 methods www-servers/apache-2.2 has been removed in 2019. Signed-off-by: Hans de Graaff gentoo.org> 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