diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
| commit | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch) | |
| tree | 021998302365c5652e37824b6c26d4d969a62055 /eclass | |
| parent | 70b82ae359a5538711e103b0e8dfb92654296644 (diff) | |
gentoo resync : 03.11.2018
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37605 -> 37603 bytes | |||
| -rw-r--r-- | eclass/php-pear-r2.eclass | 22 |
2 files changed, 11 insertions, 11 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex b019a551e7fe..73698a0e0ac0 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass index 2a4508d6e709..e4197522b162 100644 --- a/eclass/php-pear-r2.eclass +++ b/eclass/php-pear-r2.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 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-bugs@gentoo.org> # @AUTHOR: # Author: Brian Evans <grknight@gentoo.org> -# @SUPPORTED_EAPIS: 6 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: Provides means for an easy installation of PEAR packages. # @DESCRIPTION: # This eclass provides means for an easy installation of PEAR packages. @@ -17,7 +17,7 @@ EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm case "${EAPI:-0}" in - 6) + 6|7) ;; *) die "Unsupported EAPI=${EAPI} for ${ECLASS}" @@ -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,5 +123,5 @@ 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}" } |