On 1/17/19 8:14 PM, Brian Evans wrote: > Here are the proposed changes (please excuse any mail client line wrapping):
Committed with ID c95baab3e63. Brian > > $ git diff -- php-ext-source-r3.eclass > diff --git a/eclass/php-ext-source-r3.eclass > b/eclass/php-ext-source-r3.eclass > index 66d32d5c5eb..fd45317e63d 100644 > --- a/eclass/php-ext-source-r3.eclass > +++ b/eclass/php-ext-source-r3.eclass > @@ -1,10 +1,10 @@ > -# Copyright 1999-2018 Gentoo Foundation > +# Copyright 1999-2019 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > > # @ECLASS: php-ext-source-r3.eclass > # @MAINTAINER: > # Gentoo PHP team <[email protected]> > -# @SUPPORTED_EAPIS: 6 > +# @SUPPORTED_EAPIS: 6 7 > # @BLURB: Compile and install standalone PHP extensions. > # @DESCRIPTION: > # A unified interface for compiling and installing standalone PHP > @@ -14,8 +14,8 @@ inherit autotools > > EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test > > -case ${EAPI} in > - 6) ;; > +case ${EAPI:-0} in > + 6|7) ;; > *) > die "${ECLASS} is not compatible with EAPI=${EAPI}" > esac > @@ -106,6 +106,7 @@ esac > # conditional like "php?", but only when PHP_EXT_OPTIONAL_USE is > # non-null. The option group "|| (..." is always started here. > REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( " > +PHPDEPEND="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } " > for _php_target in ${USE_PHP}; do > # Now loop through each USE_PHP target and add the corresponding > # dev-lang/php slot to PHPDEPEND. > @@ -125,19 +126,17 @@ unset _php_slot _php_target > # Finally, end the optional group that we started before the loop. Close > # 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" > > -RDEPEND="${RDEPEND} > - ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } > - ${PHPDEPEND} > - ${PHP_EXT_OPTIONAL_USE:+ )}" > - > -DEPEND="${DEPEND} > - sys-devel/m4 > - sys-devel/libtool > - ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } > - ${PHPDEPEND} > - ${PHP_EXT_OPTIONAL_USE:+ )} > -" > +RDEPEND="${PHPDEPEND}" > + > +case ${EAPI:-0} in > + 6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; > + 7) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; > +esac > + > +unset PHPDEPEND TOOLDEPS > > # @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE > # @DEFAULT_UNSET >
signature.asc
Description: OpenPGP digital signature
