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 5C2241581FB for ; Tue, 27 Aug 2024 15:22:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AB1F2E2B29; Tue, 27 Aug 2024 15:16:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 73B31E2B26 for ; Tue, 27 Aug 2024 15:16:39 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 25/50] php-pear-r2.eclass: drop support for EAPI 6 Date: Tue, 27 Aug 2024 17:15:10 +0200 Message-ID: <20240827151553.210835-25-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: ad5d17f3-978b-417e-8a14-bc7fecb20370 X-Archives-Hash: 5695205f3cd9a0387edefa4627e41383 Signed-off-by: David Seifert --- eclass/php-pear-r2.eclass | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass index 9882c7dcc700..263db8d19f92 100644 --- a/eclass/php-pear-r2.eclass +++ b/eclass/php-pear-r2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: php-pear-r2.eclass @@ -6,7 +6,7 @@ # Gentoo PHP Team # @AUTHOR: # Author: Brian Evans -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Provides means for an easy installation of PEAR packages. # @DESCRIPTION: # This eclass provides means for an easy installation of PEAR packages. @@ -15,7 +15,7 @@ # on purpose; please use (R)DEPEND to define them correctly! case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -23,7 +23,7 @@ if [[ -z ${_PHP_PEAR_R2_ECLASS} ]]; then _PHP_PEAR_R2_ECLASS=1 RDEPEND=">=dev-php/pear-1.8.1" -[[ ${EAPI} != [67] ]] && IDEPEND=">=dev-php/pear-1.8.1" +[[ ${EAPI} != 7 ]] && IDEPEND=">=dev-php/pear-1.8.1" # @ECLASS_VARIABLE: PHP_PEAR_PKG_NAME # @DESCRIPTION: @@ -100,20 +100,20 @@ php-pear-r2_src_install() { # Register package with the local PEAR database. php-pear-r2_pkg_postinst() { # Add unknown channels - if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then - "${EROOT%/}/usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null + if [[ -f "${EROOT}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then + "${EROOT}/usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null if [[ $? -ne 0 ]]; then - "${EROOT%/}/usr/bin/peardev" channel-add \ - "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" \ + "${EROOT}/usr/bin/peardev" channel-add \ + "${EROOT}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" \ || einfo "Ignore any errors about existing channels" fi fi # Register the package from the package{,2}.xml file # It is not critical to complete so only warn on failure - if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then - "${EROOT%/}/usr/bin/peardev" install -nrO --force \ - "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \ + if [[ -f "${EROOT}/usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then + "${EROOT}/usr/bin/peardev" install -nrO --force \ + "${EROOT}/usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \ || ewarn "Failed to insert package into local PEAR database" fi } @@ -123,7 +123,7 @@ php-pear-r2_pkg_postinst() { # Deregister package from the local PEAR database php-pear-r2_pkg_postrm() { # Uninstall known dependency - "${EROOT%/}/usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}" + "${EROOT}/usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}" } fi -- 2.46.0