From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-dev+bounces-86551-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B49DD138334
for <garchives@archives.gentoo.org>; Fri, 18 Jan 2019 01:14:39 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 607BAE0AEC;
Fri, 18 Jan 2019 01:14:36 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id ECE6CE09A8
for <gentoo-dev@lists.gentoo.org>; Fri, 18 Jan 2019 01:14:34 +0000 (UTC)
Received: from [IPv6:2601:98a:103:dc20:519d:403f:445e:e814] (unknown [IPv6:2601:98a:103:dc20:519d:403f:445e:e814])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
(Authenticated sender: grknight)
by smtp.gentoo.org (Postfix) with ESMTPSA id CB66E335CFB
for <gentoo-dev@lists.gentoo.org>; Fri, 18 Jan 2019 01:14:32 +0000 (UTC)
To: gentoo-dev@lists.gentoo.org
From: Brian Evans <grknight@gentoo.org>
Subject: [gentoo-dev] EAPI 7 changes for php-ext-source-r3.eclass
Openpgp: preference=signencrypt
Autocrypt: addr=grknight@gentoo.org; keydata=
xsBNBFMOffsBCAC1yeQP2IkMoAlVzs2DXurf+eFYxYtFnh3/jIzLa/tM1hiTUHG47lOuZUf5
R13iTVJ8jWXjsQvSQuf/3wLBjZjBBE8iVp+WIYLGaAtRVx8bI2ssPKGNMggv+jR4TrzdZ5+l
GJJT9CmCAwU4UD0BipbJDQjes9I0s1BIndAAMGSBx+rHnlINWaT93276rfEP7Z53r8gzoG22
HHmwIUi522rsCpqwlhy6AAiN2HOE06eQLtgZKgwwo4C1xL4FuuSyPMGGU/nKmUJbMgrb2xV7
OKXL8JjF3mGQ0cf648k3CnVojOPqJ5xQoHLQorzIweFylB5NhzRaj1paljQxqkIUEalrABEB
AAHNIUJyaWFuIEV2YW5zIDxncmtuaWdodEBnZW50b28ub3JnPsLAlwQTAQgAQQIbAwIeAQIX
gAIZAQUJCwqcLxYhBE/DMQh1XidTY/2y/04V4vFnx44dBQJYQYD3BQsJCAcDBRUKCQgLBRYD
AgEAAAoJEE4V4vFnx44dRkoIAKrSLvZpQ+DosolEO9uYadJCIuSKczDHuHS223Pyb50BN5vT
vnG88rFyPLMQAbwPT1jhMoYnSRY7zFFTswGkBeBrK5n3Bq5KXKgQDRWJAYg9uV3gfSDINd1i
MqRy4VCQ/PKH4jz07wFJ5ZM08tlw6ff0CPS8psT2Q2ty/3etSvx1+w+S+R7Y3WXBq6jmtlvh
rSC9wUUBa6hjrdVoCjrfCZn7MUJwUm+ImgMCXc9E0M8/J2hKFLYv3G/tl188nmQmkwIq+Ndj
XeJgatjAZIAGXxxO9O1Yi8Iy8CH+/+RTMsBTWZe/h6iZMNjKzUDkkHXrjRLt0y34XxZr7mRX
3RLLq3bOwE0EUw59+wEIANSN1xXeQGYpGpHzeoqfCGQD73DdxMiHYHgVBEMH5+H/fN2mQcTg
6HCZBQaqgXOo+6KeN3ugYZLJbaLvQyIDKVcaoBJcUe1+7REhZUZqXn/ag9K2UeSc4zzuIWFu
IhrlBQj8ZSMfe00f6e7wYZVgmy8ftcNmxxQTXM4nc5afxPuxUsZyTKCfK5rxeSPm2NvKo4Zu
Mad/MX10cVgwnA/dny2504vkQA6LITtUFQ+FSW1BN//ZHy5TnMG13yEot6ak5RMB+VJjvd1K
L/igBZAFjiM9Rv2ZFHvE4d/CZtFNQZoYg6UZ5BTVPfwU7AKsC59fH0AyYTRuFNLPtIS8p/1j
zDcAEQEAAcLAXwQYAQIACQUCUw59+wIbDAAKCRBOFeLxZ8eOHdXaCACWkn09qVw1u99THMdK
2H5R3vWvbqVDbUCulCOqwrJfPsuzjG+hZyaLRjQxj1aHNfLkd+7s+maf131e1eTjUZ1asv4P
nfXWRyoVHPv2K2NS18Tq0sdt8mUWBFpkIeQZAULfraMMYMUh1ZPsHPRFGpg2x4zZpTEXPN4t
mPhiwK/6pbcHJpGOtzIDMA4olEf7skJ+Qld9mIhLfbbLaJUxOX6hsBU9y+4gZ1gsfR0RRVN5
MQjkWajnOHLuFq8IihW9t5hU8rjRT9ErlIkjB7Us1n9tqSF6F2i8fiKwOTqBOsdXHAuv+t8E
4bBzP3AwRnD6RZWTqBaZO51oWOeN4FYAjckD
Message-ID: <df3de8fc-dbff-92b1-70f3-203e8ffa82b5@gentoo.org>
Date: Thu, 17 Jan 2019 20:14:23 -0500
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
Thunderbird/60.4.0
Precedence: bulk
List-Post: <mailto:gentoo-dev@lists.gentoo.org>
List-Help: <mailto:gentoo-dev+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-dev+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-dev+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-dev.gentoo.org>
X-BeenThere: gentoo-dev@lists.gentoo.org
Reply-to: gentoo-dev@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
protocol="application/pgp-signature";
boundary="gOqTY9aVBGFcrwiAfcLecbMlMvfLdJHlo"
X-Archives-Salt: d53f4326-f501-4fa1-bd8d-10cd5025a8dc
X-Archives-Hash: aa18fa42c1c861aa9b5d9a0ba7399a02
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--gOqTY9aVBGFcrwiAfcLecbMlMvfLdJHlo
Content-Type: multipart/mixed; boundary="9oxCwlv8Kbph2KuVtzESmuDx24iBSZiLD";
protected-headers="v1"
From: Brian Evans <grknight@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Message-ID: <df3de8fc-dbff-92b1-70f3-203e8ffa82b5@gentoo.org>
Subject: EAPI 7 changes for php-ext-source-r3.eclass
--9oxCwlv8Kbph2KuVtzESmuDx24iBSZiLD
Content-Type: multipart/mixed;
boundary="------------F65F2E8371545928C6C7DCCA"
Content-Language: en-US
This is a multi-part message in MIME format.
--------------F65F2E8371545928C6C7DCCA
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Here are the proposed changes (please excuse any mail client line wrappin=
g):
$ 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_t=
est
-case ${EAPI} in
- 6) ;;
+case ${EAPI:-0} in
+ 6|7) ;;
*)
die "${ECLASS} is not compatible with EAPI=3D${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=3D"${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| (=
"
+PHPDEPEND=3D"${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+=3D") ${PHP_EXT_OPTIONAL_USE:+ )}"
+PHPDEPEND+=3D" ${PHP_EXT_OPTIONAL_USE:+ )}"
+TOOLDEPS=3D"sys-devel/m4 sys-devel/libtool"
-RDEPEND=3D"${RDEPEND}
- ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
- ${PHPDEPEND}
- ${PHP_EXT_OPTIONAL_USE:+ )}"
-
-DEPEND=3D"${DEPEND}
- sys-devel/m4
- sys-devel/libtool
- ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
- ${PHPDEPEND}
- ${PHP_EXT_OPTIONAL_USE:+ )}
-"
+RDEPEND=3D"${PHPDEPEND}"
+
+case ${EAPI:-0} in
+ 6) DEPEND=3D"${TOOLDEPS} ${PHPDEPEND}" ;;
+ 7) DEPEND=3D"${PHPDEPEND}" ; BDEPEND=3D"${TOOLDEPS} ${PHPDEPEND}" ;;
+esac
+
+unset PHPDEPEND TOOLDEPS
# @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE
# @DEFAULT_UNSET
--------------F65F2E8371545928C6C7DCCA
Content-Type: text/x-patch;
name="php-ext-source-r3-eapi7.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="php-ext-source-r3-eapi7.patch"
$ git diff -- php-ext-source-r3.eclass
diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.e=
class
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
=20
# @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
=20
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_t=
est
=20
-case ${EAPI} in
- 6) ;;
+case ${EAPI:-0} in
+ 6|7) ;;
*)
die "${ECLASS} is not compatible with EAPI=3D${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=3D"${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }|| (=
"
+PHPDEPEND=3D"${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+=3D") ${PHP_EXT_OPTIONAL_USE:+ )}"
+PHPDEPEND+=3D" ${PHP_EXT_OPTIONAL_USE:+ )}"
+TOOLDEPS=3D"sys-devel/m4 sys-devel/libtool"
=20
-RDEPEND=3D"${RDEPEND}
- ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
- ${PHPDEPEND}
- ${PHP_EXT_OPTIONAL_USE:+ )}"
-
-DEPEND=3D"${DEPEND}
- sys-devel/m4
- sys-devel/libtool
- ${PHP_EXT_OPTIONAL_USE}${PHP_EXT_OPTIONAL_USE:+? ( }
- ${PHPDEPEND}
- ${PHP_EXT_OPTIONAL_USE:+ )}
-"
+RDEPEND=3D"${PHPDEPEND}"
+
+case ${EAPI:-0} in
+ 6) DEPEND=3D"${TOOLDEPS} ${PHPDEPEND}" ;;
+ 7) DEPEND=3D"${PHPDEPEND}" ; BDEPEND=3D"${TOOLDEPS} ${PHPDEPEND}" ;;
+esac
+
+unset PHPDEPEND TOOLDEPS
=20
# @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE
# @DEFAULT_UNSET
--------------F65F2E8371545928C6C7DCCA--
--9oxCwlv8Kbph2KuVtzESmuDx24iBSZiLD--
--gOqTY9aVBGFcrwiAfcLecbMlMvfLdJHlo
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQKTBAEBCgB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlxBKHVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
o7ai4BAAznWDvY7gtrmQS78DfjlHbwuLkxLC9iUlhGQoe/Rn/L3wKeWsZkX3s1ai
YFnWrMwtYBO+h0YPL44b5jsUIlTLr8Jlp9NOOT/tZLtMgyBKOsiJwmeUrn+G09nI
3xzQPRpxpgNGeNCs+I3mq+MLlAbxuHeZcyxPk2lUkquQkmAdz+biqSFUuRv7SfNi
cORwJwpUQ9/QKG2cp5Zo5N2W0JEWvpJBZeb9dlcV5zERwsZZXG1pJkizD+3dcwOV
v3XsYOXB9lRuJQ9bI8FnXeeK9DaVOCybbOPEnHLVyY4iDF+s/FzMhM3tlIOjN9ce
cLSNXum21eaeyz6+jF05TbjFjFVqY15Cvll1UEoMnv7zWShquzuT4Mn/5Y8mWkDY
BuQgM+yTqvE+gf29Gt7FOuh7YTM0uHn6pzTg21Dbtd26+c9pUcXkHJKaXDZT2SMH
8iOaqBqkYwYT/c9igOWWtboUtcCgPlZ3YdwWvUlwjvXOb/Rh5veGB90T+v/JhYm+
O5pxlJsaL3wKwVNXZ/j/eo0s5JMINYET7mTJEE+iVIiTZgaI5vgohUi3JQJR07Cl
5AOnKDEuGCJNruMqAAXFsreCsyFayYOJEovw5guuM+hTymJiIWi5/iicD2TsZAcJ
hC+BhV0EVozLgB1DNxg5jjMDqOfX+yOcSwpXI5kEfc33XrAPONc=
=G4lH
-----END PGP SIGNATURE-----
--gOqTY9aVBGFcrwiAfcLecbMlMvfLdJHlo--