[PATCH v2 5/5] qmake-utils.eclass: Switch to qt_get_broot_binary for EAPI-9

Andreas Sturmlechner <[email protected]> Sat, 11 Jul 2026 11:58:37 +0200
Newsgroups gmane.linux.gentoo.devel
Message-ID <[email protected]>
--nextPartjEm8FdTJQ96PABYW9PbXjQ
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="utf-8"; protected-headers="v1"
From: Andreas Sturmlechner <[email protected]>
To: [email protected], [email protected]
Date: Sat, 11 Jul 2026 11:58:37 +0200
Message-ID: <[email protected]>
In-Reply-To: <[email protected]>
References: <[email protected]>
MIME-Version: 1.0

... which prepends BROOT instead of EPREFIX as it was with EAPI-8.

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

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index 024d23a32f26..79c8deaf8c66 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -173,7 +173,11 @@ eqmake6() {
 	local -a args
 	mapfile -t args <<<"$(qt6_get_qmake_args)"
 	# NB: we're passing literal quotes in but qmake doesn't seem to mind
-	"$(qt6_get_bindir)"/qmake -makefile "${args[@]}" "$@"
+	if [[ ${EAPI} == 8 ]]; then
+		"$(qt6_get_bindir)"/qmake -makefile "${args[@]}" "$@"
+	else
+		"$(qt_get_broot_binary 6 qmake)" -makefile "${args[@]}" 
"$@"
+	fi
 
 	if ! eend $? ; then
 		echo
-- 
2.55.0


--nextPartjEm8FdTJQ96PABYW9PbXjQ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part.
Content-Transfer-Encoding: 7Bit

-----BEGIN PGP SIGNATURE-----

iQIvBAABCgCZFiEE34gXUSooizdYNDu3S5FW4z0PgBkFAmpSE80bFIAAAAAABAAO
bWFudTIsMi41KzEuMTIsMiwyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25z
Lm9wZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRERjg4MTc1MTJBMjg4QjM3NTgzNDNC
Qjc0QjkxNTZFMzNEMEY4MDE5AAoJEEuRVuM9D4AZ2EcL/iBU4EcfuSgbSfhb2moX
VYefmTPmYukWkvI8oPsG5o+gJS/Zyuu7DJkbX9fNHgsxp/1RNx+M+ws1NVrGsc7K
IpK7hpXBVl2RFcKLnUeT5i2eLjfaJjzZi8zj5ZXtFrYIdOnECa3iJljO658t9ulY
ZM6K19cO4l1W8RYgd0Uwi5+ebPz2M4xF+d+7E+p/9A78MtsNsCFky0Avi4pwMr0J
MZQLAC/X50Io4BsVKjgK0vHsmglCc8lxlhHUhF55y5Z+5gQLY45y/nmo0CT6kl7J
xM4jwdrkHyHVGahKqeF6P7ezg/MZh/TdiNpoVndrxZZpsj8AqdEXOpZGXYp14Fan
37ZHxdhpcm/TEbO7WFaXlmZiGel5UFsxfdPvJkFBzOM5KpTPiylY/+2yTKEF8lN6
gu46hCiVVW6PNGUdoZtvbItYgRS0iVOyyEJCigGfvWzkOVUAXz3fXbyGBar7JK/6
XiuQ1vQTNRY0/UrdeW5zjIEttmYU1IfrWC1+82aEmFja8Q==
=z57K
-----END PGP SIGNATURE-----

--nextPartjEm8FdTJQ96PABYW9PbXjQ--