Signed-off-by: David Seifert <s...@gentoo.org>
---
eclass/flag-o-matic.eclass | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass
index c6b1ad80e12e..040a8529a048 100644
--- a/eclass/flag-o-matic.eclass
+++ b/eclass/flag-o-matic.eclass
@@ -4,14 +4,14 @@
# @ECLASS: flag-o-matic.eclass
# @MAINTAINER:
# toolch...@gentoo.org
-# @SUPPORTED_EAPIS: 6 7 8
+# @SUPPORTED_EAPIS: 7 8
# @BLURB: common functions to manipulate and query toolchain flags
# @DESCRIPTION:
# This eclass contains a suite of functions to help developers sanely
# and safely manage toolchain flags in their builds.
case ${EAPI} in
- 6|7|8) ;;
+ 7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
@@ -20,8 +20,6 @@ _FLAG_O_MATIC_ECLASS=1
inherit toolchain-funcs
-[[ ${EAPI} == 6 ]] && inherit eqawarn
-
# @FUNCTION: all-flag-vars
# @DESCRIPTION:
# Return all the flag variables that our high level functions operate on.
@@ -35,7 +33,7 @@ all-flag-vars() {
# {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} == [67] ]] ||
+ [[ ${EAPI} == 7 ]] ||
die "Internal function ${FUNCNAME} is not available in EAPI
${EAPI}."
_setup-allowed-flags "$@"
}
@@ -566,7 +564,7 @@ strip-flags() {
# Returns shell true if <flag> is supported by given <compiler>,
# else returns shell false.
test-flag-PROG() {
- [[ ${EAPI} == [67] ]] ||
+ [[ ${EAPI} == 7 ]] ||
die "Internal function ${FUNCNAME} is not available in EAPI
${EAPI}."
_test-flag-PROG "$@"
}
@@ -716,7 +714,7 @@ test-flag-CCLD() { _test-flag-PROG CC c+ld "$@"; }
# Returns shell true if <flags> are supported by given <compiler>,
# else returns shell false.
test-flags-PROG() {
- [[ ${EAPI} == [67] ]] ||
+ [[ ${EAPI} == 7 ]] ||
die "Internal function ${FUNCNAME} is not available in EAPI
${EAPI}."
_test-flags-PROG "$@"
}
--
2.46.0
