[PATCH 3/3] qmake-utils.eclass: Support EAPI 9, excluding qt5_* functions

Andreas Sturmlechner <[email protected]> Thu, 02 Jul 2026 22:43:55 +0200

Newsgroups	gmane.linux.gentoo.devel
Message-ID	<[email protected]>

Signed-off-by: Andreas Sturmlechner <[email protected]>
---
 eclass/qmake-utils.eclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 2796638950a8..024d23a32f26 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -6,7 +6,7 @@
 # [email protected]
 # @AUTHOR:
 # Davide Pesavento <[email protected]>
-# @SUPPORTED_EAPIS: 8
+# @SUPPORTED_EAPIS: 8 9
 # @PROVIDES: qt-utils
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
@@ -18,16 +18,17 @@
 # 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
-	8) ;;
+	8|9) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
-_QMAKE_UTILS_ECLASS=1
-
 inherit qt-utils toolchain-funcs
 
+if [[ ${EAPI} == 8 ]]; then
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
 # Echoes the directory where Qt5 binaries are installed.
@@ -122,6 +123,7 @@ eqmake5() {
 		die "eqmake5 failed"
 	fi
 }
+fi
 
 # @FUNCTION: qt6_get_qmake_args
 # @DESCRIPTION:
-- 
2.55.0

signature.asc (application/pgp-signature, 829 B)