diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-09-27 16:35:42 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-09-27 16:35:42 +0000 |
| commit | 2caf4c4473f8797fc87c1e6679e2b4311b5565ce (patch) | |
| tree | 50fbfa35a7de20bf0500c5db8ea034f856a5b1de /eclass/scons-utils.eclass | |
| parent | Require >=jdk-1.5 for javacc-5.0 and drop SLOT 2. #315557 (diff) | |
| download | gentoo-2-2caf4c4473f8797fc87c1e6679e2b4311b5565ce.tar.gz gentoo-2-2caf4c4473f8797fc87c1e6679e2b4311b5565ce.tar.bz2 gentoo-2-2caf4c4473f8797fc87c1e6679e2b4311b5565ce.zip | |
naive bump of all EAPI-specific checks in eclasses to permit EAPI=5 where EAPI=4 was previously allowed
Diffstat (limited to 'eclass/scons-utils.eclass')
| -rw-r--r-- | eclass/scons-utils.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass index 99ea918fa4f1..c458af5d0aef 100644 --- a/eclass/scons-utils.eclass +++ b/eclass/scons-utils.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.10 2011/12/13 18:37:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/scons-utils.eclass,v 1.11 2012/09/27 16:35:42 axs Exp $ # @ECLASS: scons-utils.eclass # @MAINTAINER: @@ -73,7 +73,7 @@ # -- EAPI support check -- case ${EAPI:-0} in - 0|1|2|3|4) ;; + 0|1|2|3|4|5) ;; *) die "EAPI ${EAPI} unsupported." esac @@ -105,7 +105,7 @@ escons() { "${@}" ret=${?} - [[ ${ret} -ne 0 && ${EAPI} == 4 ]] && die "escons failed." + [[ ${ret} -ne 0 ]] && has "${EAPI:-0}" 4 5 && die "escons failed." return ${ret} } |