* [gentoo-dev] EAPI 7 changes for php-ext-source-r3.eclass
@ 2019-01-18 1:14 Brian Evans
2019-01-19 19:32 ` [gentoo-dev] " Brian Evans
0 siblings, 1 reply; 2+ messages in thread
From: Brian Evans @ 2019-01-18 1:14 UTC (permalink / raw
To: gentoo-dev
[-- Attachment #1.1.1: Type: text/plain, Size: 2348 bytes --]
Here are the proposed changes (please excuse any mail client line wrapping):
$ 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 <php-bugs@gentoo.org>
-# @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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: php-ext-source-r3-eapi7.patch --]
[-- Type: text/x-patch; name="php-ext-source-r3-eapi7.patch", Size: 2270 bytes --]
$ 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 <php-bugs@gentoo.org>
-# @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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-dev] Re: EAPI 7 changes for php-ext-source-r3.eclass
2019-01-18 1:14 [gentoo-dev] EAPI 7 changes for php-ext-source-r3.eclass Brian Evans
@ 2019-01-19 19:32 ` Brian Evans
0 siblings, 0 replies; 2+ messages in thread
From: Brian Evans @ 2019-01-19 19:32 UTC (permalink / raw
To: gentoo-dev
[-- Attachment #1.1: Type: text/plain, Size: 2583 bytes --]
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 <php-bugs@gentoo.org>
> -# @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
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-19 19:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-18 1:14 [gentoo-dev] EAPI 7 changes for php-ext-source-r3.eclass Brian Evans
2019-01-19 19:32 ` [gentoo-dev] " Brian Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox