summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Michael <fedora.dm0@gmail.com>2021-06-25 15:52:01 -0400
committerDavide Pesavento <pesa@gentoo.org>2021-07-09 03:41:03 +0200
commit5d58c2ea1762e5c57d58265d4055378beaab54b6 (patch)
tree5a01333734ebc8e4dc49ab0a0fa20b87bae0f15c
parentnet-p2p/syncthing: Stabilize 1.17.0 ppc64, #800989 (diff)
downloadgentoo-5d58c2ea.tar.gz
gentoo-5d58c2ea.tar.bz2
gentoo-5d58c2ea.zip
qmake-utils.eclass: EAPI 8 support
https://github.com/gentoo/gentoo/pull/21539 Signed-off-by: David Michael <fedora.dm0@gmail.com> Signed-off-by: Davide Pesavento <pesa@gentoo.org>
-rw-r--r--eclass/qmake-utils.eclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 0d49eb94382c..d726b3620295 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 @@
# qt@gentoo.org
# @AUTHOR:
# Davide Pesavento <pesa@gentoo.org>
-# @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