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 B88E0158020 for ; Tue, 27 Dec 2022 16:31:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05383E086D; Tue, 27 Dec 2022 16:31:17 +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 2EA22E086D for ; Tue, 27 Dec 2022 16:31:16 +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 DC458340FFE for ; Tue, 27 Dec 2022 16:31:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F1A67F4 for ; Tue, 27 Dec 2022 16:31:13 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1672158601.9d50b34797fd71640962fe33a6845715a7e15928.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/php-ext-source-r3.eclass X-VCS-Directories: eclass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 9d50b34797fd71640962fe33a6845715a7e15928 X-VCS-Branch: master Date: Tue, 27 Dec 2022 16:31:13 +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: 19fdebd8-6eb5-452e-9f2d-eeeab66cbded X-Archives-Hash: a6ac19b1dace7a13ed2088f62202cc6f commit: 9d50b34797fd71640962fe33a6845715a7e15928 Author: David Seifert gentoo org> AuthorDate: Tue Dec 27 16:30:01 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Dec 27 16:30:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d50b347 php-ext-source-r3.eclass: drop EAPI 6 support Signed-off-by: David Seifert gentoo.org> eclass/php-ext-source-r3.eclass | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass index b60d5528d526..7179ab756f6b 100644 --- a/eclass/php-ext-source-r3.eclass +++ b/eclass/php-ext-source-r3.eclass @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: php-ext-source-r3.eclass # @MAINTAINER: # Gentoo PHP team -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Compile and install standalone PHP extensions. # @DESCRIPTION: # A unified interface for compiling and installing standalone PHP @@ -12,11 +12,9 @@ inherit autotools -case ${EAPI:-0} in - 6) inherit eapi7-ver ;; +case ${EAPI} in 7|8) ;; - *) - die "${ECLASS} is not compatible with EAPI=${EAPI}" + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac # @ECLASS_VARIABLE: PHP_EXT_NAME @@ -128,14 +126,17 @@ unset _php_slot _php_target # the USE-conditional if PHP_EXT_OPTIONAL_USE is non-null. REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" PHPDEPEND+=" ${PHP_EXT_OPTIONAL_USE:+ )}" -TOOLDEPS="sys-devel/m4 sys-devel/libtool" +TOOLDEPS=" + sys-devel/m4 + sys-devel/libtool +" RDEPEND="${PHPDEPEND}" - -case ${EAPI:-0} in - 6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; - 7|8) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; -esac +DEPEND="${PHPDEPEND}" +BDEPEND=" + ${TOOLDEPS} + ${PHPDEPEND} +" unset PHPDEPEND TOOLDEPS