commit: 11f1705e0f0f77eb56e213719594331745f3938f Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun Feb 22 20:38:08 2026 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun Feb 22 20:38:08 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f1705e
Revert "edo.eclass: Support EAPI 9" Making the edo() definition conditional on EAPI caused a spurious pkgcheck warning in EAPI 8. Therefore reverting for now. This reverts commit 039d53fd14444a7fa56fbf0eb4fe2fe3f57ed084. Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eclass/edo.eclass | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/eclass/edo.eclass b/eclass/edo.eclass index fdb2cea8ad62..a308851aca7f 100644 --- a/eclass/edo.eclass +++ b/eclass/edo.eclass @@ -6,12 +6,11 @@ # QA Team <[email protected]> # @AUTHOR: # Sam James <[email protected]> -# @SUPPORTED_EAPIS: 7 8 9 -# @BLURB: convenience function to run commands verbosely and die on failure +# @SUPPORTED_EAPIS: 7 8 +# @BLURB: Convenience function to run commands verbosely and die on failure # @DESCRIPTION: -# This eclass provides the 'edo' command in EAPIs 7 and 8, and an 'edob' -# variant for ebegin/eend, which logs the command used verbosely and -# dies (exits) on failure. +# This eclass provides the 'edo' command, and an 'edob' variant for ebegin/eend, +# which logs the command used verbosely and dies (exits) on failure. # # The 'edo' command should be used only where needed to give a more verbose log, # e.g. for invoking non-standard ./configure scripts, or building @@ -23,16 +22,14 @@ # those commands produce output. The 'edob' command will suppress the # command's output and only present it if the command returned with a # non-zero exit status. - -if [[ -z ${_EDO_ECLASS} ]] ; then -_EDO_ECLASS=1 - case ${EAPI} in - 7|8|9) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac -if [[ ${EAPI} = [78] ]]; then +if [[ -z ${_EDO_ECLASS} ]] ; then +_EDO_ECLASS=1 + # @FUNCTION: edo # @USAGE: <command> [<args>...] # @DESCRIPTION: @@ -60,7 +57,6 @@ edo() { printf '%s\n' "${out:1}" >&2 "$@" || die -n "Failed to run command: ${1}" } -fi # @FUNCTION: edob # @USAGE: [-l <log-name>] [-m <message>] <command> [<args>...]
