1 |
Signed-off-by: David Seifert <soap@g.o> |
2 |
--- |
3 |
eclass/php-ext-source-r3.eclass | 25 +++++++++++++------------ |
4 |
1 file changed, 13 insertions(+), 12 deletions(-) |
5 |
|
6 |
diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass |
7 |
index b60d5528d52..7179ab756f6 100644 |
8 |
--- a/eclass/php-ext-source-r3.eclass |
9 |
+++ b/eclass/php-ext-source-r3.eclass |
10 |
@@ -1,10 +1,10 @@ |
11 |
-# Copyright 1999-2021 Gentoo Authors |
12 |
+# Copyright 1999-2022 Gentoo Authors |
13 |
# Distributed under the terms of the GNU General Public License v2 |
14 |
|
15 |
# @ECLASS: php-ext-source-r3.eclass |
16 |
# @MAINTAINER: |
17 |
# Gentoo PHP team <php-bugs@g.o> |
18 |
-# @SUPPORTED_EAPIS: 6 7 8 |
19 |
+# @SUPPORTED_EAPIS: 7 8 |
20 |
# @BLURB: Compile and install standalone PHP extensions. |
21 |
# @DESCRIPTION: |
22 |
# A unified interface for compiling and installing standalone PHP |
23 |
@@ -12,11 +12,9 @@ |
24 |
|
25 |
inherit autotools |
26 |
|
27 |
-case ${EAPI:-0} in |
28 |
- 6) inherit eapi7-ver ;; |
29 |
+case ${EAPI} in |
30 |
7|8) ;; |
31 |
- *) |
32 |
- die "${ECLASS} is not compatible with EAPI=${EAPI}" |
33 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
34 |
esac |
35 |
|
36 |
# @ECLASS_VARIABLE: PHP_EXT_NAME |
37 |
@@ -128,14 +126,17 @@ unset _php_slot _php_target |
38 |
# the USE-conditional if PHP_EXT_OPTIONAL_USE is non-null. |
39 |
REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" |
40 |
PHPDEPEND+=" ${PHP_EXT_OPTIONAL_USE:+ )}" |
41 |
-TOOLDEPS="sys-devel/m4 sys-devel/libtool" |
42 |
+TOOLDEPS=" |
43 |
+ sys-devel/m4 |
44 |
+ sys-devel/libtool |
45 |
+" |
46 |
|
47 |
RDEPEND="${PHPDEPEND}" |
48 |
- |
49 |
-case ${EAPI:-0} in |
50 |
- 6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; |
51 |
- 7|8) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;; |
52 |
-esac |
53 |
+DEPEND="${PHPDEPEND}" |
54 |
+BDEPEND=" |
55 |
+ ${TOOLDEPS} |
56 |
+ ${PHPDEPEND} |
57 |
+" |
58 |
|
59 |
unset PHPDEPEND TOOLDEPS |
60 |
|
61 |
-- |
62 |
2.39.0 |