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

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

[Andreas Sturmlechner]

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

qa-reports showing >7300 ebuilds with EAPI-7 using eutils.eclass, that can't be right.

- Restrict inherit eutils to <EAPI-8
- Drop bogus multilib.eclass (inherited by toolchain-funcs.eclass anyway)
- Several functions look like they should be internal
- Fix eclassdoc issues, add missing docu

See also:
https://qa-reports.gentoo.org/output/eapi-per-eclass/eutils.eclass/
https://github.com/gentoo/gentoo/pull/20207


diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index 20ee39d98ba..35dc09f94de 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -1,4 +1,4 @@
-# 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
@@ -12,16 +12,37 @@
 if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then
 _FLAG_O_MATIC_ECLASS=1
 
-inherit eutils toolchain-funcs multilib
+inherit toolchain-funcs
 
+case ${EAPI} in
+	[0-7]) inherit eutils ;;
+	*) ;;
+esac
+
+# @FUNCTION: all-flag-vars
+# @DESCRIPTION:
 # Return all the flag variables that our high level funcs operate on.
 all-flag-vars() {
 	echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
 }
 
+# @FUNCTION: setup-allowed-flags
+# @INTERNAL
+# @DESCRIPTION:
 # {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
 # Note: shell globs and character lists are allowed
 setup-allowed-flags() {
+	[[ ${EAPI} == [0-7] ]] ||
+		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
+	_setup-allowed-flags
+}
+
+# @FUNCTION: _setup-allowed-flags
+# @INTERNAL
+# @DESCRIPTION:
+# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
+# Note: shell globs and character lists are allowed
+_setup-allowed-flags() {
 	ALLOWED_FLAGS=(
 		-pipe -O '-O[12sg]' -mcpu -march -mtune
 		'-fstack-protector*' '-fsanitize*' '-fstack-check*' -fno-stack-check
@@ -87,7 +108,10 @@ setup-allowed-flags() {
 	)
 }
 
-# inverted filters for hardened compiler.  This is trying to unpick
+# @FUNCTION: _filter-hardened
+# @INTERNAL
+# @DESCRIPTION:
+# Inverted filters for hardened compiler.  This is trying to unpick
 # the hardened compiler defaults.
 _filter-hardened() {
 	local f
@@ -121,6 +145,9 @@ _filter-hardened() {
 	done
 }
 
+# @FUNCTION: _filter-var
+# @INTERNAL
+# @DESCRIPTION:
 # Remove occurrences of strings from variable given in $1
 # Strings removed are matched as globs, so for example
 # '-O*' would remove -O1, -O2 etc.
@@ -313,6 +340,11 @@ replace-cpu-flags() {
 	return 0
 }
 
+# @FUNCTION: _is_flagq
+# @USAGE: <variable> <flag>
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flag> is in a given <variable>, else returns shell false.
 _is_flagq() {
 	local x var="$1[*]"
 	for x in ${!var} ; do
@@ -405,7 +437,7 @@ strip-flags() {
 	local x y var
 
 	local ALLOWED_FLAGS
-	setup-allowed-flags
+	_setup-allowed-flags
 
 	set -f	# disable pathname expansion
 
@@ -438,7 +470,23 @@ strip-flags() {
 	return 0
 }
 
+# @FUNCTION: test-flag-PROG
+# @USAGE: <compiler> <flag>
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flag> is supported by given <compiler>, else returns shell false.
 test-flag-PROG() {
+	[[ ${EAPI} == [0-7] ]] ||
+		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
+	_test-flag-PROG
+}
+
+# @FUNCTION: _test-flag-PROG
+# @USAGE: <compiler> <flag>
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flag> is supported by given <compiler>, else returns shell false.
+_test-flag-PROG() {
 	local comp=$1
 	local lang=$2
 	shift 2
@@ -533,33 +581,49 @@ test-flag-PROG() {
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the C compiler, else returns shell false.
-test-flag-CC() { test-flag-PROG "CC" c "$@"; }
+test-flag-CC() { _test-flag-PROG "CC" c "$@"; }
 
 # @FUNCTION: test-flag-CXX
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the C++ compiler, else returns shell false.
-test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; }
+test-flag-CXX() { _test-flag-PROG "CXX" c++ "$@"; }
 
 # @FUNCTION: test-flag-F77
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the Fortran 77 compiler, else returns shell false.
-test-flag-F77() { test-flag-PROG "F77" f77 "$@"; }
+test-flag-F77() { _test-flag-PROG "F77" f77 "$@"; }
 
 # @FUNCTION: test-flag-FC
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the Fortran 90 compiler, else returns shell false.
-test-flag-FC() { test-flag-PROG "FC" f95 "$@"; }
+test-flag-FC() { _test-flag-PROG "FC" f95 "$@"; }
 
 # @FUNCTION: test-flag-CCLD
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the C compiler and linker, else returns shell false.
-test-flag-CCLD() { test-flag-PROG "CC" c+ld "$@"; }
+test-flag-CCLD() { _test-flag-PROG "CC" c+ld "$@"; }
 
+# @FUNCTION: test-flags-PROG
+# @USAGE: <compiler> <flag> [more flags...]
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flags> are supported by given <compiler>, else returns shell false.
 test-flags-PROG() {
+	[[ ${EAPI} == [0-7] ]] ||
+		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
+	_test-flags-PROG
+}
+
+# @FUNCTION: _test-flags-PROG
+# @USAGE: <compiler> <flag> [more flags...]
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flags> are supported by given <compiler>, else returns shell false.
+_test-flags-PROG() {
 	local comp=$1
 	local flags=()
 	local x
@@ -596,31 +660,31 @@ test-flags-PROG() {
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the C compiler, else returns shell false.
-test-flags-CC() { test-flags-PROG "CC" "$@"; }
+test-flags-CC() { _test-flags-PROG "CC" "$@"; }
 
 # @FUNCTION: test-flags-CXX
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the C++ compiler, else returns shell false.
-test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
+test-flags-CXX() { _test-flags-PROG "CXX" "$@"; }
 
 # @FUNCTION: test-flags-F77
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the Fortran 77 compiler, else returns shell false.
-test-flags-F77() { test-flags-PROG "F77" "$@"; }
+test-flags-F77() { _test-flags-PROG "F77" "$@"; }
 
 # @FUNCTION: test-flags-FC
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the Fortran 90 compiler, else returns shell false.
-test-flags-FC() { test-flags-PROG "FC" "$@"; }
+test-flags-FC() { _test-flags-PROG "FC" "$@"; }
 
 # @FUNCTION: test-flags-CCLD
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the C compiler and default linker, else returns shell false.
-test-flags-CCLD() { test-flags-PROG "CCLD" "$@"; }
+test-flags-CCLD() { _test-flags-PROG "CCLD" "$@"; }
 
 # @FUNCTION: test-flags
 # @USAGE: <flags>

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Sergei Trofimovich]

On Wed, 31 Mar 2021 08:39:27 +0200
Andreas Sturmlechner <asturm@gentoo.org> wrote:

> qa-reports showing >7300 ebuilds with EAPI-7 using eutils.eclass, that can't be right.
> 
> - Restrict inherit eutils to <EAPI-8
> - Drop bogus multilib.eclass (inherited by toolchain-funcs.eclass anyway)
> - Several functions look like they should be internal
> - Fix eclassdoc issues, add missing docu
> 
> See also:
> https://qa-reports.gentoo.org/output/eapi-per-eclass/eutils.eclass/
> https://github.com/gentoo/gentoo/pull/20207

Please post series as separate patches.

> diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
> index 20ee39d98ba..35dc09f94de 100644
> --- a/eclass/flag-o-matic.eclass
> +++ b/eclass/flag-o-matic.eclass
> @@ -1,4 +1,4 @@
> -# 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
> @@ -12,16 +12,37 @@
>  if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then
>  _FLAG_O_MATIC_ECLASS=1
>  
> -inherit eutils toolchain-funcs multilib
> +inherit toolchain-funcs
>  
> +case ${EAPI} in
> +	[0-7]) inherit eutils ;;
> +	*) ;;
> +esac
> +
> +# @FUNCTION: all-flag-vars
> +# @DESCRIPTION:
>  # Return all the flag variables that our high level funcs operate on.
>  all-flag-vars() {
>  	echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
>  }
>  
> +# @FUNCTION: setup-allowed-flags
> +# @INTERNAL
> +# @DESCRIPTION:
>  # {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
>  # Note: shell globs and character lists are allowed
>  setup-allowed-flags() {
> +	[[ ${EAPI} == [0-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_setup-allowed-flags
> +}
> +
> +# @FUNCTION: _setup-allowed-flags
> +# @INTERNAL
> +# @DESCRIPTION:
> +# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
> +# Note: shell globs and character lists are allowed
> +_setup-allowed-flags() {
>  	ALLOWED_FLAGS=(
>  		-pipe -O '-O[12sg]' -mcpu -march -mtune
>  		'-fstack-protector*' '-fsanitize*' '-fstack-check*' -fno-stack-check
> @@ -87,7 +108,10 @@ setup-allowed-flags() {
>  	)
>  }
>  
> -# inverted filters for hardened compiler.  This is trying to unpick
> +# @FUNCTION: _filter-hardened
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Inverted filters for hardened compiler.  This is trying to unpick
>  # the hardened compiler defaults.
>  _filter-hardened() {
>  	local f
> @@ -121,6 +145,9 @@ _filter-hardened() {
>  	done
>  }
>  
> +# @FUNCTION: _filter-var
> +# @INTERNAL
> +# @DESCRIPTION:
>  # Remove occurrences of strings from variable given in $1
>  # Strings removed are matched as globs, so for example
>  # '-O*' would remove -O1, -O2 etc.
> @@ -313,6 +340,11 @@ replace-cpu-flags() {
>  	return 0
>  }
>  
> +# @FUNCTION: _is_flagq
> +# @USAGE: <variable> <flag>
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flag> is in a given <variable>, else returns shell false.
>  _is_flagq() {
>  	local x var="$1[*]"
>  	for x in ${!var} ; do
> @@ -405,7 +437,7 @@ strip-flags() {
>  	local x y var
>  
>  	local ALLOWED_FLAGS
> -	setup-allowed-flags
> +	_setup-allowed-flags
>  
>  	set -f	# disable pathname expansion
>  
> @@ -438,7 +470,23 @@ strip-flags() {
>  	return 0
>  }
>  
> +# @FUNCTION: test-flag-PROG
> +# @USAGE: <compiler> <flag>
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flag> is supported by given <compiler>, else returns shell false.
>  test-flag-PROG() {
> +	[[ ${EAPI} == [0-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_test-flag-PROG
> +}
> +
> +# @FUNCTION: _test-flag-PROG
> +# @USAGE: <compiler> <flag>
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flag> is supported by given <compiler>, else returns shell false.
> +_test-flag-PROG() {
>  	local comp=$1
>  	local lang=$2
>  	shift 2
> @@ -533,33 +581,49 @@ test-flag-PROG() {
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the C compiler, else returns shell false.
> -test-flag-CC() { test-flag-PROG "CC" c "$@"; }
> +test-flag-CC() { _test-flag-PROG "CC" c "$@"; }
>  
>  # @FUNCTION: test-flag-CXX
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the C++ compiler, else returns shell false.
> -test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; }
> +test-flag-CXX() { _test-flag-PROG "CXX" c++ "$@"; }
>  
>  # @FUNCTION: test-flag-F77
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the Fortran 77 compiler, else returns shell false.
> -test-flag-F77() { test-flag-PROG "F77" f77 "$@"; }
> +test-flag-F77() { _test-flag-PROG "F77" f77 "$@"; }
>  
>  # @FUNCTION: test-flag-FC
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the Fortran 90 compiler, else returns shell false.
> -test-flag-FC() { test-flag-PROG "FC" f95 "$@"; }
> +test-flag-FC() { _test-flag-PROG "FC" f95 "$@"; }
>  
>  # @FUNCTION: test-flag-CCLD
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the C compiler and linker, else returns shell false.
> -test-flag-CCLD() { test-flag-PROG "CC" c+ld "$@"; }
> +test-flag-CCLD() { _test-flag-PROG "CC" c+ld "$@"; }
>  
> +# @FUNCTION: test-flags-PROG
> +# @USAGE: <compiler> <flag> [more flags...]
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flags> are supported by given <compiler>, else returns shell false.
>  test-flags-PROG() {
> +	[[ ${EAPI} == [0-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_test-flags-PROG
> +}
> +
> +# @FUNCTION: _test-flags-PROG
> +# @USAGE: <compiler> <flag> [more flags...]
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flags> are supported by given <compiler>, else returns shell false.
> +_test-flags-PROG() {
>  	local comp=$1
>  	local flags=()
>  	local x
> @@ -596,31 +660,31 @@ test-flags-PROG() {
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the C compiler, else returns shell false.
> -test-flags-CC() { test-flags-PROG "CC" "$@"; }
> +test-flags-CC() { _test-flags-PROG "CC" "$@"; }
>  
>  # @FUNCTION: test-flags-CXX
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the C++ compiler, else returns shell false.
> -test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
> +test-flags-CXX() { _test-flags-PROG "CXX" "$@"; }
>  
>  # @FUNCTION: test-flags-F77
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the Fortran 77 compiler, else returns shell false.
> -test-flags-F77() { test-flags-PROG "F77" "$@"; }
> +test-flags-F77() { _test-flags-PROG "F77" "$@"; }
>  
>  # @FUNCTION: test-flags-FC
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the Fortran 90 compiler, else returns shell false.
> -test-flags-FC() { test-flags-PROG "FC" "$@"; }
> +test-flags-FC() { _test-flags-PROG "FC" "$@"; }
>  
>  # @FUNCTION: test-flags-CCLD
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the C compiler and default linker, else returns shell false.
> -test-flags-CCLD() { test-flags-PROG "CCLD" "$@"; }
> +test-flags-CCLD() { _test-flags-PROG "CCLD" "$@"; }
>  
>  # @FUNCTION: test-flags
>  # @USAGE: <flags>


-- 

  Sergei

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

[Andreas Sturmlechner]

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

On Mittwoch, 31. März 2021 09:33:21 CEST Sergei Trofimovich wrote:
> On Wed, 31 Mar 2021 08:39:27 +0200
> > 
> > See also:
> > https://qa-reports.gentoo.org/output/eapi-per-eclass/eutils.eclass/
> > https://github.com/gentoo/gentoo/pull/20207
> 
> Please post series as separate patches.
> 

They are separate in the linked PR, if you need to check that they are a 
proper series.

Regards

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Sergei Trofimovich]

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

On Wed, 31 Mar 2021 09:45:52 +0200
Andreas Sturmlechner <asturm@gentoo.org> wrote:

> On Mittwoch, 31. März 2021 09:33:21 CEST Sergei Trofimovich wrote:
> > On Wed, 31 Mar 2021 08:39:27 +0200  
> > > 
> > > See also:
> > > https://qa-reports.gentoo.org/output/eapi-per-eclass/eutils.eclass/
> > > https://github.com/gentoo/gentoo/pull/20207  
> > 
> > Please post series as separate patches.
> >   
> 
> They are separate in the linked PR, if you need to check that they are a 
> proper series.

I planned to provide review in this mailing list.

-- 

  Sergei

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

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

[Wolfgang E. Sanyer]

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

I'm curious - why the split e.g. test-flag-PROG() and _test-flag-PROG()? Is
this stylistic, or does it serve a functional purpose? (Hah, "functional",
get it? Because they're functions?!?

Please excuse any formatting oddness I'm not sure how to make plaintext
emails from the gmail android client

>

El mié., 31 de marzo de 2021 5:13 a. m., Sergei Trofimovich <
slyfox@gentoo.org> escribió:

> On Wed, 31 Mar 2021 09:45:52 +0200
> Andreas Sturmlechner <asturm@gentoo.org> wrote:
>
> > On Mittwoch, 31. März 2021 09:33:21 CEST Sergei Trofimovich wrote:
> > > On Wed, 31 Mar 2021 08:39:27 +0200
> > > >
> > > > See also:
> > > > https://qa-reports.gentoo.org/output/eapi-per-eclass/eutils.eclass/
> > > > https://github.com/gentoo/gentoo/pull/20207
> > >
> > > Please post series as separate patches.
> > >
> >
> > They are separate in the linked PR, if you need to check that they are a
> > proper series.
>
> I planned to provide review in this mailing list.
>
> --
>
>   Sergei
>

[-- Attachment #2: Type: text/html, Size: 2189 bytes --]

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

[Andreas Sturmlechner]

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

On Mittwoch, 31. März 2021 12:03:33 CEST Wolfgang E. Sanyer wrote:
> I'm curious - why the split e.g. test-flag-PROG() and _test-flag-PROG()? Is
> this stylistic, or does it serve a functional purpose? (Hah, "functional",
> get it? Because they're functions?!?

We prepend `_` to signify internal API. The existing function name needs to 
stay until <=EAPI-7 support is gone in order not to break potential consumers 
even outside of genoo.git.

Regards

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Andreas Sturmlechner]

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

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
 
 # Return all the flag variables that our high level funcs operate on.
 all-flag-vars() {
-- 
2.31.0


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Andreas Sturmlechner]

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

From 6d1c665d06186dde5361905d5fb2057e044b040e Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 31 Mar 2021 00:22:12 +0200
Subject: [PATCH 2/5] flag-o-matic.eclass: Make setup-allowed-flags() internal

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/flag-o-matic.eclass | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index ab79f70392d..d511a140592 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -26,9 +26,23 @@ all-flag-vars() {
 	echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
 }
 
+# @FUNCTION: setup-allowed-flags
+# @INTERNAL
+# @DESCRIPTION:
 # {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
 # Note: shell globs and character lists are allowed
 setup-allowed-flags() {
+	[[ ${EAPI} == [5-7] ]] ||
+		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
+	_setup-allowed-flags
+}
+
+# @FUNCTION: _setup-allowed-flags
+# @INTERNAL
+# @DESCRIPTION:
+# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
+# Note: shell globs and character lists are allowed
+_setup-allowed-flags() {
 	ALLOWED_FLAGS=(
 		-pipe -O '-O[12sg]' -mcpu -march -mtune
 		'-fstack-protector*' '-fsanitize*' '-fstack-check*' -fno-stack-check
@@ -412,7 +426,7 @@ strip-flags() {
 	local x y var
 
 	local ALLOWED_FLAGS
-	setup-allowed-flags
+	_setup-allowed-flags
 
 	set -f	# disable pathname expansion
 
-- 
2.31.0


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Andreas Sturmlechner]

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

From 7b063ec3f4e2a76c43cd5de8a81a0a30c0f87a6d Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 31 Mar 2021 00:27:27 +0200
Subject: [PATCH 3/5] flag-o-matic.eclass: Make test-flag-PROG() internal

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/flag-o-matic.eclass | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index d511a140592..e4fdfd0b62d 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -459,7 +459,25 @@ strip-flags() {
 	return 0
 }
 
+# @FUNCTION: test-flag-PROG
+# @USAGE: <compiler> <flag>
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flag> is supported by given <compiler>,
+# else returns shell false.
 test-flag-PROG() {
+	[[ ${EAPI} == [5-7] ]] ||
+		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
+	_test-flag-PROG
+}
+
+# @FUNCTION: _test-flag-PROG
+# @USAGE: <compiler> <flag>
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flag> is supported by given <compiler>,
+# else returns shell false.
+_test-flag-PROG() {
 	local comp=$1
 	local lang=$2
 	shift 2
@@ -554,31 +572,31 @@ test-flag-PROG() {
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the C compiler, else returns shell false.
-test-flag-CC() { test-flag-PROG "CC" c "$@"; }
+test-flag-CC() { _test-flag-PROG "CC" c "$@"; }
 
 # @FUNCTION: test-flag-CXX
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the C++ compiler, else returns shell false.
-test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; }
+test-flag-CXX() { _test-flag-PROG "CXX" c++ "$@"; }
 
 # @FUNCTION: test-flag-F77
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the Fortran 77 compiler, else returns shell false.
-test-flag-F77() { test-flag-PROG "F77" f77 "$@"; }
+test-flag-F77() { _test-flag-PROG "F77" f77 "$@"; }
 
 # @FUNCTION: test-flag-FC
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the Fortran 90 compiler, else returns shell false.
-test-flag-FC() { test-flag-PROG "FC" f95 "$@"; }
+test-flag-FC() { _test-flag-PROG "FC" f95 "$@"; }
 
 # @FUNCTION: test-flag-CCLD
 # @USAGE: <flag>
 # @DESCRIPTION:
 # Returns shell true if <flag> is supported by the C compiler and linker, else returns shell false.
-test-flag-CCLD() { test-flag-PROG "CC" c+ld "$@"; }
+test-flag-CCLD() { _test-flag-PROG "CC" c+ld "$@"; }
 
 test-flags-PROG() {
 	local comp=$1
-- 
2.31.0


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Andreas Sturmlechner]

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

From 797d26ad9fe861c9c332f54a0f856a17af32ee53 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 31 Mar 2021 00:29:55 +0200
Subject: [PATCH 4/5] flag-o-matic.eclass: Make test-flags-PROG() internal

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/flag-o-matic.eclass | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index e4fdfd0b62d..a35f0bef269 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -598,7 +598,25 @@ test-flag-FC() { _test-flag-PROG "FC" f95 "$@"; }
 # Returns shell true if <flag> is supported by the C compiler and linker, else returns shell false.
 test-flag-CCLD() { _test-flag-PROG "CC" c+ld "$@"; }
 
+# @FUNCTION: test-flags-PROG
+# @USAGE: <compiler> <flag> [more flags...]
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flags> are supported by given <compiler>,
+# else returns shell false.
 test-flags-PROG() {
+	[[ ${EAPI} == [5-7] ]] ||
+		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
+	_test-flags-PROG
+}
+
+# @FUNCTION: _test-flags-PROG
+# @USAGE: <compiler> <flag> [more flags...]
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flags> are supported by given <compiler>,
+# else returns shell false.
+_test-flags-PROG() {
 	local comp=$1
 	local flags=()
 	local x
@@ -635,31 +653,31 @@ test-flags-PROG() {
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the C compiler, else returns shell false.
-test-flags-CC() { test-flags-PROG "CC" "$@"; }
+test-flags-CC() { _test-flags-PROG "CC" "$@"; }
 
 # @FUNCTION: test-flags-CXX
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the C++ compiler, else returns shell false.
-test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
+test-flags-CXX() { _test-flags-PROG "CXX" "$@"; }
 
 # @FUNCTION: test-flags-F77
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the Fortran 77 compiler, else returns shell false.
-test-flags-F77() { test-flags-PROG "F77" "$@"; }
+test-flags-F77() { _test-flags-PROG "F77" "$@"; }
 
 # @FUNCTION: test-flags-FC
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the Fortran 90 compiler, else returns shell false.
-test-flags-FC() { test-flags-PROG "FC" "$@"; }
+test-flags-FC() { _test-flags-PROG "FC" "$@"; }
 
 # @FUNCTION: test-flags-CCLD
 # @USAGE: <flags>
 # @DESCRIPTION:
 # Returns shell true if <flags> are supported by the C compiler and default linker, else returns shell false.
-test-flags-CCLD() { test-flags-PROG "CCLD" "$@"; }
+test-flags-CCLD() { _test-flags-PROG "CCLD" "$@"; }
 
 # @FUNCTION: test-flags
 # @USAGE: <flags>
-- 
2.31.0


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Andreas Sturmlechner]

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

From af002023d6b8f9a9e51fc31c8c25d48012e35ddf Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Sun, 28 Mar 2021 15:04:50 +0200
Subject: [PATCH 5/5] flag-o-matic.eclass: Fix eclassdoc

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 eclass/flag-o-matic.eclass | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index a35f0bef269..6e7582c4643 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -21,6 +21,8 @@ case ${EAPI} in
 	*) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;;
 esac
 
+# @FUNCTION: all-flag-vars
+# @DESCRIPTION:
 # Return all the flag variables that our high level funcs operate on.
 all-flag-vars() {
 	echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
@@ -108,7 +110,10 @@ _setup-allowed-flags() {
 	)
 }
 
-# inverted filters for hardened compiler.  This is trying to unpick
+# @FUNCTION: _filter-hardened
+# @INTERNAL
+# @DESCRIPTION:
+# Inverted filters for hardened compiler.  This is trying to unpick
 # the hardened compiler defaults.
 _filter-hardened() {
 	local f
@@ -142,6 +147,9 @@ _filter-hardened() {
 	done
 }
 
+# @FUNCTION: _filter-var
+# @INTERNAL
+# @DESCRIPTION:
 # Remove occurrences of strings from variable given in $1
 # Strings removed are matched as globs, so for example
 # '-O*' would remove -O1, -O2 etc.
@@ -334,6 +342,11 @@ replace-cpu-flags() {
 	return 0
 }
 
+# @FUNCTION: _is_flagq
+# @USAGE: <variable> <flag>
+# @INTERNAL
+# @DESCRIPTION:
+# Returns shell true if <flag> is in a given <variable>, else returns shell false.
 _is_flagq() {
 	local x var="$1[*]"
 	for x in ${!var} ; do
-- 
2.31.0


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Sergei Trofimovich]

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

On Thu, 01 Apr 2021 12:02:15 +0200
Andreas Sturmlechner <asturm@gentoo.org> wrote:

> From af002023d6b8f9a9e51fc31c8c25d48012e35ddf Mon Sep 17 00:00:00 2001
> From: Andreas Sturmlechner <asturm@gentoo.org>
> Date: Sun, 28 Mar 2021 15:04:50 +0200
> Subject: [PATCH 5/5] flag-o-matic.eclass: Fix eclassdoc
> 
> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

The patch looks good.

> ---
>  eclass/flag-o-matic.eclass | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
> index a35f0bef269..6e7582c4643 100644
> --- a/eclass/flag-o-matic.eclass
> +++ b/eclass/flag-o-matic.eclass
> @@ -21,6 +21,8 @@ case ${EAPI} in
>  	*) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;;
>  esac
>  
> +# @FUNCTION: all-flag-vars
> +# @DESCRIPTION:
>  # Return all the flag variables that our high level funcs operate on.
>  all-flag-vars() {
>  	echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
> @@ -108,7 +110,10 @@ _setup-allowed-flags() {
>  	)
>  }
>  
> -# inverted filters for hardened compiler.  This is trying to unpick
> +# @FUNCTION: _filter-hardened
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Inverted filters for hardened compiler.  This is trying to unpick
>  # the hardened compiler defaults.
>  _filter-hardened() {
>  	local f
> @@ -142,6 +147,9 @@ _filter-hardened() {
>  	done
>  }
>  
> +# @FUNCTION: _filter-var
> +# @INTERNAL
> +# @DESCRIPTION:
>  # Remove occurrences of strings from variable given in $1
>  # Strings removed are matched as globs, so for example
>  # '-O*' would remove -O1, -O2 etc.
> @@ -334,6 +342,11 @@ replace-cpu-flags() {
>  	return 0
>  }
>  
> +# @FUNCTION: _is_flagq
> +# @USAGE: <variable> <flag>
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flag> is in a given <variable>, else returns shell false.
>  _is_flagq() {
>  	local x var="$1[*]"
>  	for x in ${!var} ; do
> -- 
> 2.31.0
> 


-- 

  Sergei

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

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

[Sergei Trofimovich]

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

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

> From 797d26ad9fe861c9c332f54a0f856a17af32ee53 Mon Sep 17 00:00:00 2001
> From: Andreas Sturmlechner <asturm@gentoo.org>
> Date: Wed, 31 Mar 2021 00:29:55 +0200
> Subject: [PATCH 4/5] flag-o-matic.eclass: Make test-flags-PROG() internal
> 
> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
> ---
>  eclass/flag-o-matic.eclass | 28 +++++++++++++++++++++++-----
>  1 file changed, 23 insertions(+), 5 deletions(-)
> 
> diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
> index e4fdfd0b62d..a35f0bef269 100644
> --- a/eclass/flag-o-matic.eclass
> +++ b/eclass/flag-o-matic.eclass
> @@ -598,7 +598,25 @@ test-flag-FC() { _test-flag-PROG "FC" f95 "$@"; }
>  # Returns shell true if <flag> is supported by the C compiler and linker, else returns shell false.
>  test-flag-CCLD() { _test-flag-PROG "CC" c+ld "$@"; }
>  
> +# @FUNCTION: test-flags-PROG
> +# @USAGE: <compiler> <flag> [more flags...]
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flags> are supported by given <compiler>,
> +# else returns shell false.
>  test-flags-PROG() {
> +	[[ ${EAPI} == [5-7] ]] ||

'[[ ${EAPI} == [567] ]] ||'. Otherwise patch looks ok.

> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_test-flags-PROG
> +}
> +
> +# @FUNCTION: _test-flags-PROG
> +# @USAGE: <compiler> <flag> [more flags...]
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flags> are supported by given <compiler>,
> +# else returns shell false.
> +_test-flags-PROG() {
>  	local comp=$1
>  	local flags=()
>  	local x
> @@ -635,31 +653,31 @@ test-flags-PROG() {
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the C compiler, else returns shell false.
> -test-flags-CC() { test-flags-PROG "CC" "$@"; }
> +test-flags-CC() { _test-flags-PROG "CC" "$@"; }
>  
>  # @FUNCTION: test-flags-CXX
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the C++ compiler, else returns shell false.
> -test-flags-CXX() { test-flags-PROG "CXX" "$@"; }
> +test-flags-CXX() { _test-flags-PROG "CXX" "$@"; }
>  
>  # @FUNCTION: test-flags-F77
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the Fortran 77 compiler, else returns shell false.
> -test-flags-F77() { test-flags-PROG "F77" "$@"; }
> +test-flags-F77() { _test-flags-PROG "F77" "$@"; }
>  
>  # @FUNCTION: test-flags-FC
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the Fortran 90 compiler, else returns shell false.
> -test-flags-FC() { test-flags-PROG "FC" "$@"; }
> +test-flags-FC() { _test-flags-PROG "FC" "$@"; }
>  
>  # @FUNCTION: test-flags-CCLD
>  # @USAGE: <flags>
>  # @DESCRIPTION:
>  # Returns shell true if <flags> are supported by the C compiler and default linker, else returns shell false.
> -test-flags-CCLD() { test-flags-PROG "CCLD" "$@"; }
> +test-flags-CCLD() { _test-flags-PROG "CCLD" "$@"; }
>  
>  # @FUNCTION: test-flags
>  # @USAGE: <flags>
> -- 
> 2.31.0
> 


-- 

  Sergei

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

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

[Sergei Trofimovich]

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

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

> From 7b063ec3f4e2a76c43cd5de8a81a0a30c0f87a6d Mon Sep 17 00:00:00 2001
> From: Andreas Sturmlechner <asturm@gentoo.org>
> Date: Wed, 31 Mar 2021 00:27:27 +0200
> Subject: [PATCH 3/5] flag-o-matic.eclass: Make test-flag-PROG() internal
> 
> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
> ---
>  eclass/flag-o-matic.eclass | 28 +++++++++++++++++++++++-----
>  1 file changed, 23 insertions(+), 5 deletions(-)
> 
> diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
> index d511a140592..e4fdfd0b62d 100644
> --- a/eclass/flag-o-matic.eclass
> +++ b/eclass/flag-o-matic.eclass
> @@ -459,7 +459,25 @@ strip-flags() {
>  	return 0
>  }
>  
> +# @FUNCTION: test-flag-PROG
> +# @USAGE: <compiler> <flag>
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flag> is supported by given <compiler>,
> +# else returns shell false.
>  test-flag-PROG() {
> +	[[ ${EAPI} == [5-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."

Yeah. Given that we use tc-get$1 in implementation it's not easy to
use as is in external code. Patch is ok. We can consider it later.

> +	_test-flag-PROG
> +}
> +
> +# @FUNCTION: _test-flag-PROG
> +# @USAGE: <compiler> <flag>
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flag> is supported by given <compiler>,
> +# else returns shell false.
> +_test-flag-PROG() {
>  	local comp=$1
>  	local lang=$2
>  	shift 2
> @@ -554,31 +572,31 @@ test-flag-PROG() {
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the C compiler, else returns shell false.
> -test-flag-CC() { test-flag-PROG "CC" c "$@"; }
> +test-flag-CC() { _test-flag-PROG "CC" c "$@"; }
>  
>  # @FUNCTION: test-flag-CXX
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the C++ compiler, else returns shell false.
> -test-flag-CXX() { test-flag-PROG "CXX" c++ "$@"; }
> +test-flag-CXX() { _test-flag-PROG "CXX" c++ "$@"; }
>  
>  # @FUNCTION: test-flag-F77
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the Fortran 77 compiler, else returns shell false.
> -test-flag-F77() { test-flag-PROG "F77" f77 "$@"; }
> +test-flag-F77() { _test-flag-PROG "F77" f77 "$@"; }
>  
>  # @FUNCTION: test-flag-FC
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the Fortran 90 compiler, else returns shell false.
> -test-flag-FC() { test-flag-PROG "FC" f95 "$@"; }
> +test-flag-FC() { _test-flag-PROG "FC" f95 "$@"; }
>  
>  # @FUNCTION: test-flag-CCLD
>  # @USAGE: <flag>
>  # @DESCRIPTION:
>  # Returns shell true if <flag> is supported by the C compiler and linker, else returns shell false.
> -test-flag-CCLD() { test-flag-PROG "CC" c+ld "$@"; }
> +test-flag-CCLD() { _test-flag-PROG "CC" c+ld "$@"; }
>  
>  test-flags-PROG() {
>  	local comp=$1
> -- 
> 2.31.0
> 


-- 

  Sergei

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

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

[Ulrich Mueller]

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

>>>>> On Thu, 01 Apr 2021, Andreas Sturmlechner wrote:
 
> +# @FUNCTION: test-flag-PROG
> +# @USAGE: <compiler> <flag>
> +# @INTERNAL
> +# @DESCRIPTION:
> +# Returns shell true if <flag> is supported by given <compiler>,
> +# else returns shell false.
>  test-flag-PROG() {
> +	[[ ${EAPI} == [5-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_test-flag-PROG
> +}

Any reason why this cannot say "... in EAPI ${EAPI}." as I had suggested
earlier?

(Same for the other patches in the series.)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

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

[Andreas Sturmlechner]

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

On Donnerstag, 1. April 2021 23:42:10 CEST you wrote:
> >>>>> On Thu, 01 Apr 2021, Andreas Sturmlechner wrote:
> > 
> > +	[[ ${EAPI} == [5-7] ]] ||
> > +		die "Internal function ${FUNCNAME} is not available in 
>=EAPI-8."
> > +	_test-flag-PROG
> > +}
> 
> Any reason why this cannot say "... in EAPI ${EAPI}." as I had suggested
> earlier?
> 

None at all, I just forgot about it in v2. This is fixed and ready to view in 
the PR now.

Regards

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Sergei Trofimovich]

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

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

> From 6d1c665d06186dde5361905d5fb2057e044b040e Mon Sep 17 00:00:00 2001
> From: Andreas Sturmlechner <asturm@gentoo.org>
> Date: Wed, 31 Mar 2021 00:22:12 +0200
> Subject: [PATCH 2/5] flag-o-matic.eclass: Make setup-allowed-flags() internal
> 
> Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
> ---
>  eclass/flag-o-matic.eclass | 16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
> index ab79f70392d..d511a140592 100644
> --- a/eclass/flag-o-matic.eclass
> +++ b/eclass/flag-o-matic.eclass
> @@ -26,9 +26,23 @@ all-flag-vars() {
>  	echo {ADA,C,CPP,CXX,CCAS,F,FC,LD}FLAGS
>  }
>  
> +# @FUNCTION: setup-allowed-flags
> +# @INTERNAL
> +# @DESCRIPTION:
>  # {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
>  # Note: shell globs and character lists are allowed
>  setup-allowed-flags() {
> +	[[ ${EAPI} == [5-7] ]] ||

Minor nit: I'd prefer '[[ ${EAPI} == [567] ]]'

Otherwise the patch is ok.

> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_setup-allowed-flags
> +}
> +
> +# @FUNCTION: _setup-allowed-flags
> +# @INTERNAL
> +# @DESCRIPTION:
> +# {C,CPP,CXX,CCAS,F,FC,LD}FLAGS that we allow in strip-flags
> +# Note: shell globs and character lists are allowed
> +_setup-allowed-flags() {
>  	ALLOWED_FLAGS=(
>  		-pipe -O '-O[12sg]' -mcpu -march -mtune
>  		'-fstack-protector*' '-fsanitize*' '-fstack-check*' -fno-stack-check
> @@ -412,7 +426,7 @@ strip-flags() {
>  	local x y var
>  
>  	local ALLOWED_FLAGS
> -	setup-allowed-flags
> +	_setup-allowed-flags
>  
>  	set -f	# disable pathname expansion
>  
> -- 
> 2.31.0
> 


-- 

  Sergei

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

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]

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

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

[Sam James]

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



> On 31 Mar 2021, at 07:39, Andreas Sturmlechner <asturm@gentoo.org> wrote:
> 
> qa-reports showing >7300 ebuilds with EAPI-7 using eutils.eclass, that can't be right.
> 
> - Restrict inherit eutils to <EAPI-8
> - Drop bogus multilib.eclass (inherited by toolchain-funcs.eclass anyway)
> - Several functions look like they should be internal
> - Fix eclassdoc issues, add missing docu
> 
> See also:
> https://qa-reports.gentoo.org/output/eapi-per-eclass/eutils.eclass/
> https://github.com/gentoo/gentoo/pull/20207

Looks good and similar to what I had previously (as a draft). Good work and a nice
opportunity to kill off some internal functions too.


[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

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

[Ulrich Mueller]

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

>>>>> On Wed, 31 Mar 2021, Andreas Sturmlechner wrote:

>  setup-allowed-flags() {
> +	[[ ${EAPI} == [0-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_setup-allowed-flags
> +}

Strictly speaking, EAPIs are strings, so numeric comparison is not
meaningful. Suggestion: "... is not available in EAPI ${EAPI}."

>  test-flag-PROG() {
> +	[[ ${EAPI} == [0-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_test-flag-PROG
> +}

>  test-flags-PROG() {
> +	[[ ${EAPI} == [0-7] ]] ||
> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
> +	_test-flags-PROG
> +}

Same for these.

Ulrich

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

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

[Sam James]

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



> On 31 Mar 2021, at 10:09, Ulrich Mueller <ulm@gentoo.org> wrote:
> 
>>>>>> On Wed, 31 Mar 2021, Andreas Sturmlechner wrote:
> 
>> setup-allowed-flags() {
>> +	[[ ${EAPI} == [0-7] ]] ||
>> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
>> +	_setup-allowed-flags
>> +}
> 
> Strictly speaking, EAPIs are strings, so numeric comparison is not
> meaningful. Suggestion: "... is not available in EAPI ${EAPI}."

That’s a reason to not do arithmetic comparison in e.g. Bash, but >= refers
to age/chronological order here, which isn’t a problem.

> 
>> test-flag-PROG() {
>> +	[[ ${EAPI} == [0-7] ]] ||
>> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
>> +	_test-flag-PROG
>> +}
> 
>> test-flags-PROG() {
>> +	[[ ${EAPI} == [0-7] ]] ||
>> +		die "Internal function ${FUNCNAME} is not available in >=EAPI-8."
>> +	_test-flags-PROG
>> +}
> 
> Same for these.
> 
> Ulrich


[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 618 bytes --]