[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     6b8c209958c23fd06731d4468a72b23216bab889
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 25 06:34:59 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 26 17:05:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b8c2099

eutils.eclass: Minor touchups of EAPI conditionals

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 eclass/eutils.eclass | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 2d90c35d9ad..5d1e0e8e83d 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -23,7 +23,7 @@ if [[ -z ${_EUTILS_ECLASS} ]]; then
 _EUTILS_ECLASS=1
 
 # implicitly inherited (now split) eclasses
-case ${EAPI:-0} in
+case ${EAPI} in
 	5|6)
 		inherit desktop edos2unix epatch estack l10n ltprune multilib \
 			preserve-libs toolchain-funcs vcs-clean wrapper
@@ -172,10 +172,9 @@ in_iuse() {
 	has "${flag}" "${liuse[@]#[+-]}"
 }
 
-fi
+fi # EAPI 5
 
-case ${EAPI:-0} in
-5|6)
+if [[ ${EAPI} == [56] ]] ; then
 
 # @FUNCTION: eqawarn
 # @USAGE: [message]
@@ -190,7 +189,6 @@ if ! declare -F eqawarn >/dev/null ; then
 	}
 fi
 
-;;
-esac
+fi # EAPI [56]
 
 fi