[PATCH 2/3] qmake-utils.eclass: Use qt6_* functions from qt-utils.eclass

Andreas Sturmlechner <[email protected]> Thu, 02 Jul 2026 22:43:16 +0200
Newsgroups	gmane.linux.gentoo.devel
Message-ID	<[email protected]>
Signed-off-by: Andreas Sturmlechner <[email protected]>
---
 eclass/qmake-utils.eclass | 49 ++++-----------------------------------
 1 file changed, 5 insertions(+), 44 deletions(-)

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 1be7524693ad..2796638950a8 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -7,10 +7,14 @@
 # @AUTHOR:
 # Davide Pesavento <[email protected]>
 # @SUPPORTED_EAPIS: 8
+# @PROVIDES: qt-utils
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
 # Utility eclass providing wrapper functions for Qt qmake.
 #
+# This eclass unconditionally inherits qt-utils.eclass and all its public
+# helper functions may be considered as part of this eclass's API.
+#
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
 
@@ -22,7 +26,7 @@ esac
 if [[ -z ${_QMAKE_UTILS_ECLASS} ]]; then
 _QMAKE_UTILS_ECLASS=1
 
-inherit toolchain-funcs
+inherit qt-utils toolchain-funcs
 
 # @FUNCTION: qt5_get_bindir
 # @DESCRIPTION:
@@ -119,49 +123,6 @@ eqmake5() {
 	fi
 }
 
-# @FUNCTION: qt6_get_bindir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 binaries are installed.
-# EPREFIX is already prepended to the returned path.
-qt6_get_bindir() {
-	echo ${EPREFIX}$(qt6_get_libdir)/qt6/bin
-}
-
-# @FUNCTION: qt6_get_headerdir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 headers are installed.
-qt6_get_headerdir() {
-	echo /usr/include/qt6
-}
-
-# @FUNCTION: qt6_get_libdir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 libraries are installed.
-qt6_get_libdir() {
-	echo /usr/$(get_libdir)
-}
-
-# @FUNCTION: qt6_get_libexecdir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 libexec bins are installed.
-qt6_get_libexecdir() {
-	echo $(qt6_get_libdir)/qt6/libexec
-}
-
-# @FUNCTION: qt6_get_mkspecsdir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 mkspecs are installed.
-qt6_get_mkspecsdir() {
-	echo $(qt6_get_libdir)/qt6/mkspecs
-}
-
-# @FUNCTION: qt6_get_plugindir
-# @DESCRIPTION:
-# Echoes the directory where Qt6 plugins are installed.
-qt6_get_plugindir() {
-	echo $(qt6_get_libdir)/qt6/plugins
-}
-
 # @FUNCTION: qt6_get_qmake_args
 # @DESCRIPTION:
 # Echoes a multi-line string containing arguments to pass to qmake.
-- 
2.55.0
signature.asc (application/pgp-signature, 829 B)