Signed-off-by: David Seifert <s...@gentoo.org>
---
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 <php-b...@gentoo.org>
# @AUTHOR:
# Author: Brian Evans <grkni...@gentoo.org>
-# @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
