diff options
| author |   Michael Orlitzky <mjo@gentoo.org> | 2016-01-30 17:19:38 -0500 |
|---|---|---|
| committer | Michael Orlitzky <mjo@gentoo.org> | 2016-02-03 17:10:24 -0500 |
| commit | 6b3110e30b90034b1aefab1fae71a184b1dba582 (patch) | |
| tree | c6f753dfa4d2c338ff94d6e9b692c2c106c85d31 /eclass | |
| parent | www-client/vivaldi: Version bump. (diff) | |
| download | gentoo-6b3110e30b90034b1aefab1fae71a184b1dba582.tar.gz gentoo-6b3110e30b90034b1aefab1fae71a184b1dba582.tar.bz2 gentoo-6b3110e30b90034b1aefab1fae71a184b1dba582.zip | |
php-pear-r1.eclass: add support for EAPI=6 and clean up the EAPI check.
The dev-lang/php dependency in php-pear-r1.eclass is calculated based
on the EAPI. In newer EAPIs, we specify the "any slot" operator to
avoid repoman warnings. Previously, the "any slot" operator was added
only for EAPI=5; this commit adds it for EAPI=6.
In addition, EAPIs 0, 1, 2, 3, and 4 are named explicitly in the case
statement. The default "*" case now dies with a warning that the EAPI
is unsupported.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-pear-r1.eclass | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass index 85eee287746b..237cf835b83c 100644 --- a/eclass/php-pear-r1.eclass +++ b/eclass/php-pear-r1.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,14 +19,17 @@ inherit multilib EXPORT_FUNCTIONS pkg_setup src_install -# Silence repoman warnings case "${EAPI:-0}" in - 5) - PHP_DEPEND="dev-lang/php:*" - ;; - *) - PHP_DEPEND="dev-lang/php" - ;; + 0|1|2|3|4) + PHP_DEPEND="dev-lang/php" + ;; + 5|6) + # Repoman will complain about the missing slot in newer EAPIs. + PHP_DEPEND="dev-lang/php:*" + ;; + *) + die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" + ;; esac DEPEND="${PHP_DEPEND} |