Re: [gentoo-dev] [PATCH v2 1/5] flag-o-matic.eclass: get rid of eutils in <EAPI-8, fix eclassdoc, make some funcs internal

[Sergei Trofimovich <slyfox@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 1973 bytes --]

On Thu, 01 Apr 2021 11:57:01 +0200
Andreas Sturmlechner <asturm@gentoo.org> wrote:

> From 0bdac63ac30fdbe2d1293d0ecbdbc2a5ea673112 Mon Sep 17 00:00:00 2001
> From: Andreas Sturmlechner <asturm@gentoo.org>
> Date: Sun, 28 Mar 2021 11:41:32 +0200
> Subject: [PATCH 1/5] flag-o-matic.eclass: SUPPORTED_EAPIS: 5,6,7; drop eutils,
>  multilib
> 
> - eutils was only used for eqawarn in old EAPI
> - multilib usage unknown, but is inherited by toolchain-funcs anyway
> 
> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
> ---
>  eclass/flag-o-matic.eclass | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
> index 20ee39d98ba..ab79f70392d 100644
> --- a/eclass/flag-o-matic.eclass
> +++ b/eclass/flag-o-matic.eclass
> @@ -1,9 +1,10 @@
> -# Copyright 1999-2020 Gentoo Authors
> +# Copyright 1999-2021 Gentoo Authors
>  # Distributed under the terms of the GNU General Public License v2
>  
>  # @ECLASS: flag-o-matic.eclass
>  # @MAINTAINER:
>  # toolchain@gentoo.org
> +# @SUPPORTED_EAPIS: 5 6 7
>  # @BLURB: common functions to manipulate and query toolchain flags
>  # @DESCRIPTION:
>  # This eclass contains a suite of functions to help developers sanely
> @@ -12,7 +13,13 @@
>  if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then
>  _FLAG_O_MATIC_ECLASS=1
>  
> -inherit eutils toolchain-funcs multilib
> +inherit toolchain-funcs
> +
> +case ${EAPI} in
> +	[0-4]) die "flag-o-matic.eclass: EAPI ${EAPI} is too old." ;;
> +	[5-7]) inherit eutils ;;
> +	*) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;;
> +esac

Minor nit: I'd prefer more typical '|' style for string enumerations.
    case ${EAPI:-0} in
           0|1|2|3|4) ...
           5|6|7) ...

Otherwise patch is good.

>  # Return all the flag variables that our high level funcs operate on.
>  all-flag-vars() {
> -- 
> 2.31.0
> 

-- 

  Sergei

[-- Attachment #2: Цифровая подпись OpenPGP --]
[-- Type: application/pgp-signature, Size: 981 bytes --]