commit: 5d58c2ea1762e5c57d58265d4055378beaab54b6 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Fri Jun 25 19:52:01 2021 +0000 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> CommitDate: Fri Jul 9 01:41:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d58c2ea
qmake-utils.eclass: EAPI 8 support https://github.com/gentoo/gentoo/pull/21539 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org> eclass/qmake-utils.eclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass index 0d49eb94382..d726b362029 100644 --- a/eclass/qmake-utils.eclass +++ b/eclass/qmake-utils.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: qmake-utils.eclass @@ -6,7 +6,7 @@ # [email protected] # @AUTHOR: # Davide Pesavento <[email protected]> -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Common functions for qmake-based packages. # @DESCRIPTION: # Utility eclass providing wrapper functions for Qt5 qmake. @@ -14,14 +14,14 @@ # This eclass does not set any metadata variables nor export any phase # functions. It can be inherited safely. -if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then -_QMAKE_UTILS_ECLASS=1 - case ${EAPI} in - 7) ;; - *) die "EAPI=${EAPI:-0} is not supported" ;; + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then +_QMAKE_UTILS_ECLASS=1 + inherit toolchain-funcs # @FUNCTION: _qmake-utils_banned_func
