Gentoo Archives: gentoo-dev

From: Brian Evans <grknight@g.o>
To: gentoo-dev@l.g.o
Subject: [gentoo-dev] [PATCH] eclass: Enable EAPI 8 on PHP eclasses
Date: Fri, 19 Nov 2021 19:35:43
Message-Id: 20211119193450.61525-1-grknight@gentoo.org
1 Signed-off-by: Brian Evans <grknight@g.o>
2 ---
3 eclass/php-ext-pecl-r3.eclass | 4 ++--
4 eclass/php-ext-source-r3.eclass | 6 +++---
5 eclass/php-pear-r2.eclass | 5 ++++-
6 3 files changed, 9 insertions(+), 6 deletions(-)
7
8 diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass
9 index 0d1485aa1f7..8f2a92f0fcb 100644
10 --- a/eclass/php-ext-pecl-r3.eclass
11 +++ b/eclass/php-ext-pecl-r3.eclass
12 @@ -4,7 +4,7 @@
13 # @ECLASS: php-ext-pecl-r3.eclass
14 # @MAINTAINER:
15 # Gentoo PHP team <php-bugs@g.o>
16 -# @SUPPORTED_EAPIS: 6 7
17 +# @SUPPORTED_EAPIS: 6 7 8
18 # @PROVIDES: php-ext-source-r3
19 # @BLURB: A uniform way to install PECL extensions
20 # @DESCRIPTION:
21 @@ -13,7 +13,7 @@
22 # see https://pecl.php.net/
23
24 case ${EAPI:-0} in
25 - [67]) ;;
26 + 6|7|8) ;;
27 *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
28 esac
29
30 diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
31 index 556b51ecb0c..4f580436d3e 100644
32 --- a/eclass/php-ext-source-r3.eclass
33 +++ b/eclass/php-ext-source-r3.eclass
34 @@ -4,7 +4,7 @@
35 # @ECLASS: php-ext-source-r3.eclass
36 # @MAINTAINER:
37 # Gentoo PHP team <php-bugs@g.o>
38 -# @SUPPORTED_EAPIS: 6 7
39 +# @SUPPORTED_EAPIS: 6 7 8
40 # @BLURB: Compile and install standalone PHP extensions.
41 # @DESCRIPTION:
42 # A unified interface for compiling and installing standalone PHP
43 @@ -14,7 +14,7 @@ inherit autotools
44
45 case ${EAPI:-0} in
46 6) inherit eapi7-ver ;;
47 - 7) ;;
48 + 7|8) ;;
49 *)
50 die "${ECLASS} is not compatible with EAPI=${EAPI}"
51 esac
52 @@ -134,7 +134,7 @@ RDEPEND="${PHPDEPEND}"
53
54 case ${EAPI:-0} in
55 6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
56 - 7) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
57 + 7|8) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
58 esac
59
60 unset PHPDEPEND TOOLDEPS
61 diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
62 index f0fe4b96f8e..45ff81b92eb 100644
63 --- a/eclass/php-pear-r2.eclass
64 +++ b/eclass/php-pear-r2.eclass
65 @@ -6,7 +6,7 @@
66 # Gentoo PHP Team <php-bugs@g.o>
67 # @AUTHOR:
68 # Author: Brian Evans <grknight@g.o>
69 -# @SUPPORTED_EAPIS: 6 7
70 +# @SUPPORTED_EAPIS: 6 7 8
71 # @BLURB: Provides means for an easy installation of PEAR packages.
72 # @DESCRIPTION:
73 # This eclass provides means for an easy installation of PEAR packages.
74 @@ -19,6 +19,9 @@ EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
75 case "${EAPI:-0}" in
76 6|7)
77 ;;
78 + 8)
79 + IDEPEND=">=dev-php/pear-1.8.1"
80 + ;;
81 *)
82 die "Unsupported EAPI=${EAPI} for ${ECLASS}"
83 ;;
84 --
85 2.34.0