From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Jun 2021 10:15:54 +0100 Subject: gentoo resync : 29.06.2021 --- eclass/eutils.eclass | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'eclass/eutils.eclass') diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 2d90c35d9ade..207d05e7f975 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -23,12 +23,12 @@ 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 + inherit desktop edos2unix epatch estack ltprune multilib \ + preserve-libs strip-linguas toolchain-funcs vcs-clean wrapper ;; - 7) inherit edos2unix l10n wrapper ;; + 7) inherit edos2unix strip-linguas wrapper ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -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 -- cgit v1.2.3