[gentoo-dev] [PATCH] eclass: Enable EAPI 8 on PHP eclasses

[gentoo-dev] [PATCH] eclass: Enable EAPI 8 on PHP eclasses

[Brian Evans]

Signed-off-by: Brian Evans <grknight@gentoo.org>
---
 eclass/php-ext-pecl-r3.eclass   | 4 ++--
 eclass/php-ext-source-r3.eclass | 6 +++---
 eclass/php-pear-r2.eclass       | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/eclass/php-ext-pecl-r3.eclass b/eclass/php-ext-pecl-r3.eclass
index 0d1485aa1f7..8f2a92f0fcb 100644
--- a/eclass/php-ext-pecl-r3.eclass
+++ b/eclass/php-ext-pecl-r3.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: php-ext-pecl-r3.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @PROVIDES: php-ext-source-r3
 # @BLURB: A uniform way to install PECL extensions
 # @DESCRIPTION:
@@ -13,7 +13,7 @@
 # see https://pecl.php.net/
 
 case ${EAPI:-0} in
-	[67]) ;;
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass
index 556b51ecb0c..4f580436d3e 100644
--- a/eclass/php-ext-source-r3.eclass
+++ b/eclass/php-ext-source-r3.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: php-ext-source-r3.eclass
 # @MAINTAINER:
 # Gentoo PHP team <php-bugs@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Compile and install standalone PHP extensions.
 # @DESCRIPTION:
 # A unified interface for compiling and installing standalone PHP
@@ -14,7 +14,7 @@ inherit autotools
 
 case ${EAPI:-0} in
 	6) inherit eapi7-ver ;;
-	7) ;;
+	7|8) ;;
 	*)
 		die "${ECLASS} is not compatible with EAPI=${EAPI}"
 esac
@@ -134,7 +134,7 @@ RDEPEND="${PHPDEPEND}"
 
 case ${EAPI:-0} in
 	6) DEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
-	7) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
+	7|8) DEPEND="${PHPDEPEND}" ; BDEPEND="${TOOLDEPS} ${PHPDEPEND}" ;;
 esac
 
 unset PHPDEPEND TOOLDEPS
diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass
index f0fe4b96f8e..45ff81b92eb 100644
--- a/eclass/php-pear-r2.eclass
+++ b/eclass/php-pear-r2.eclass
@@ -6,7 +6,7 @@
 # Gentoo PHP Team <php-bugs@gentoo.org>
 # @AUTHOR:
 # Author: Brian Evans <grknight@gentoo.org>
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Provides means for an easy installation of PEAR packages.
 # @DESCRIPTION:
 # This eclass provides means for an easy installation of PEAR packages.
@@ -19,6 +19,9 @@ EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 case "${EAPI:-0}" in
 	6|7)
 		;;
+	8)
+		IDEPEND=">=dev-php/pear-1.8.1"
+		;;
 	*)
 		die "Unsupported EAPI=${EAPI} for ${ECLASS}"
 		;;
-- 
2.34.0