From 12b96919c87fe9391c5ed4afb87838f6981c4d3d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sun, 11 Apr 2021 22:36:57 +0200 Subject: 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 Signed-off-by: Sam James --- eclass/flag-o-matic.eclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'eclass/flag-o-matic.eclass') diff --git a/eclass/flag-o-matic.eclass b/eclass/flag-o-matic.eclass index 20ee39d98bad..b2510ec56009 100644 --- a/eclass/flag-o-matic.eclass +++ b/eclass/flag-o-matic.eclass @@ -1,18 +1,27 @@ -# 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 # and safely manage toolchain flags in their builds. +case ${EAPI:-0} in + 0|1|2|3|4) die "flag-o-matic.eclass: EAPI ${EAPI} is too old." ;; + 5|6|7) ;; + *) die "EAPI ${EAPI} is not supported by flag-o-matic.eclass." ;; +esac + if [[ -z ${_FLAG_O_MATIC_ECLASS} ]]; then _FLAG_O_MATIC_ECLASS=1 -inherit eutils toolchain-funcs multilib +inherit toolchain-funcs + +[[ ${EAPI} == [567] ]] && inherit eutils # Return all the flag variables that our high level funcs operate on. all-flag-vars() { -- cgit v1.2.3-65-gdbad