Skip to content

Commit

Permalink
eclass: Enable EAPI 8 on PHP eclasses
Browse files Browse the repository at this point in the history
Signed-off-by: Brian Evans <[email protected]>
  • Loading branch information
Brian Evans committed Nov 24, 2021
1 parent b1e3436 commit d91dc89
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions eclass/php-ext-pecl-r3.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# @ECLASS: php-ext-pecl-r3.eclass
# @MAINTAINER:
# Gentoo PHP team <[email protected]>
# @SUPPORTED_EAPIS: 6 7
# @SUPPORTED_EAPIS: 6 7 8
# @PROVIDES: php-ext-source-r3
# @BLURB: A uniform way to install PECL extensions
# @DESCRIPTION:
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions eclass/php-ext-source-r3.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# @ECLASS: php-ext-source-r3.eclass
# @MAINTAINER:
# Gentoo PHP team <[email protected]>
# @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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion eclass/php-pear-r2.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Gentoo PHP Team <[email protected]>
# @AUTHOR:
# Author: Brian Evans <[email protected]>
# @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.
Expand All @@ -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}"
;;
Expand Down

0 comments on commit d91dc89

Please sign in to comment.