1 |
On 1/17/19 8:14 PM, Brian Evans wrote: |
2 |
> Here are the proposed changes (please excuse any mail client line wrapping): |
3 |
|
4 |
Committed with ID c95baab3e63. |
5 |
|
6 |
Brian |
7 |
|
8 |
|
9 |
> |
10 |
> $ git diff -- php-ext-source-r3.eclass |
11 |
> diff --git a/eclass/php-ext-source-r3.eclass |
12 |
> b/eclass/php-ext-source-r3.eclass |
13 |
> index 66d32d5c5eb..fd45317e63d 100644 |
14 |
> --- a/eclass/php-ext-source-r3.eclass |
15 |
> +++ b/eclass/php-ext-source-r3.eclass |
16 |
> @@ -1,10 +1,10 @@ |
17 |
> -# Copyright 1999-2018 Gentoo Foundation |
18 |
> +# Copyright 1999-2019 Gentoo Authors |
19 |
> # Distributed under the terms of the GNU General Public License v2 |
20 |
> |
21 |
> # @ECLASS: php-ext-source-r3.eclass |
22 |
> # @MAINTAINER: |
23 |
> # Gentoo PHP team <php-bugs@g.o> |
24 |
> -# @SUPPORTED_EAPIS: 6 |
25 |
> +# @SUPPORTED_EAPIS: 6 7 |
26 |
> # @BLURB: Compile and install standalone PHP extensions. |
27 |
> # @DESCRIPTION: |
28 |
> # A unified interface for compiling and installing standalone PHP |
29 |
> @@ -14,8 +14,8 @@ inherit autotools |
30 |
> |
31 |
> EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test |
32 |
> |
33 |
> -case ${EAPI} in |
34 |
> - 6) ;; |
35 |
> +case ${EAPI:-0} in |
36 |
> + 6|7) ;; |
37 |
> *) |
38 |
> die "${ECLASS} is not compatible with EAPI=${EAPI}" |
39 |
> esac |
40 |
> @@ -106,6 +106,7 @@ esac |
41 |
> # conditional like "php?", but only when PHP_EXT_OPTIONAL_USE is |
42 |
> # non-null. The option group "|| (..." is always started here. |
43 |
> REQUIRED_USE="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| ( " |
44 |
> +PHPDEPEND="${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } " |
45 |
> for _php_target in ${USE_PHP}; do |
46 |
> # Now loop through each USE_PHP target and add the corresponding |
47 |
> # dev-lang/php slot to PHPDEPEND. |
48 |
> @@ -125,19 +126,17 @@ unset _php_slot _php_target |
49 |
> # Finally, end the optional group that we started before the loop. Close |
50 |
> # the USE-conditional if PHP_EXT_OPTIONAL_USE is non-null. |
51 |
> REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" |
52 |
> +PHPDEPEND+=" ${PHP_EXT_OPTIONAL_USE:+ )}" |
53 |
> +TOOLDEPS="sys-devel/m4 sys-devel/libtool" |
54 |
> |
55 |
> -RDEPEND="${RDEPEND} |
56 |
> - ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } |
57 |
> - ${PHPDEPEND} |
58 |
> - ${PHP_EXT_OPTIONAL_USE:+ )}" |
59 |
> - |
60 |
> -DEPEND="${DEPEND} |
61 |
> - sys-devel/m4 |
62 |
> - sys-devel/libtool |
63 |
> - ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( } |
64 |
> - ${PHPDEPEND} |
65 |
> - ${PHP_EXT_OPTIONAL_USE:+ )} |
66 |
> -" |
67 |
> +RDEPEND="${PHPDEPEND}" |
68 |
> + |
69 |
> +case ${EAPI:-0} in |
70 |
> + 6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; |
71 |
> + 7) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; |
72 |
> +esac |
73 |
> + |
74 |
> +unset PHPDEPEND TOOLDEPS |
75 |
> |
76 |
> # @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE |
77 |
> # @DEFAULT_UNSET |
78 |
> |