Re: [PATCH] edo.eclass: support EAPI 9

Florian Schmaus <[email protected]> writes:

> Signed-off-by: Florian Schmaus <[email protected]>
> ---
>  eclass/edo.eclass | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>

This isn't right. First, edo is already provded in EAPI 9, so its
definition would have to be guarded.

Secondly, see:

commit 11f1705e0f0f77eb56e213719594331745f3938f
Author: Ulrich Müller <[email protected]>
Date:   Sun Feb 22 21:38:08 2026 +0100

    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 <[email protected]>

I think it makes sense for edob to be split into its own eclass instead.

> diff --git a/eclass/edo.eclass b/eclass/edo.eclass
> index a308851aca7f..b889ad554507 100644
> --- a/eclass/edo.eclass
> +++ b/eclass/edo.eclass
> @@ -1,4 +1,4 @@
> -# Copyright 2022-2025 Gentoo Authors
> +# Copyright 2022-2026 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>  
>  # @ECLASS: edo.eclass
> @@ -6,7 +6,7 @@
>  # QA Team <[email protected]>
>  # @AUTHOR:
>  # Sam James <[email protected]>
> -# @SUPPORTED_EAPIS: 7 8
> +# @SUPPORTED_EAPIS: 7 8 9
>  # @BLURB: Convenience function to run commands verbosely and die on failure
>  # @DESCRIPTION:
>  # This eclass provides the 'edo' command, and an 'edob' variant for ebegin/eend,
> @@ -23,7 +23,7 @@
>  # command's output and only present it if the command returned with a
>  # non-zero exit status.
>  case ${EAPI} in
> -	7|8) ;;
> +	7|8|9) ;;
>  	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
>  esac

sam

-----BEGIN PGP SIGNATURE-----

iQEBBAEWCgCpFiEEJaa7iN2bdkxrVUHCc4QJ9SDfkZAFAmqE2UgbFIAAAAAABAAO
bWFudTIsMi41KzEuMTIsMiwyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25z
Lm9wZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyNUE2QkI4OEREOUI3NjRDNkI1NTQx
QzI3Mzg0MDlGNTIwREY5MTkwDxxzYW1AZ2VudG9vLm9yZwAKCRBzhAn1IN+RkC1E
AQDSYEpOKgmY6KnqrMOGFsYsVuydNSRigI8ZzVhTe1nKOAEAlZoai1mnrTLsn8m4
Lot/D7AMGCofejYxHzYvWuc46gI=
=GVvq
-----END PGP SIGNATURE-----