[gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/

[Ionen Wolkens]

commit:     bccf210c4456ce4eae2e8edfd55e592fa9901d4f
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 11:36:00 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 11:54:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bccf210c

dev-qt/qttools: fix clang selection for >=6.9

Qt added new logic for clang selection where it iterates through
a list of supported version and always picks the most recent one
from that list ignoring the eclass.

May be a better way, but for now just remove the version check.

Does not seem to have been backported to 6.8, so leaving that
one alone.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qttools/qttools-6.9.9999.ebuild | 7 +++++++
 dev-qt/qttools/qttools-6.9999.ebuild   | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/dev-qt/qttools/qttools-6.9.9999.ebuild 
b/dev-qt/qttools/qttools-6.9.9999.ebuild
index ebf1142f7f02..74e7e707f774 100644
--- a/dev-qt/qttools/qttools-6.9.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9.9999.ebuild
@@ -62,6 +62,13 @@ DEPEND="
        )
 "
 
+src_prepare() {
+       qt6-build_src_prepare
+
+       # qttools is picky about clang versions and ignores LLVM_SLOT
+       sed -i '/find_package/s/${VERSION}//' cmake/FindWrapLibClang.cmake || 
die
+}
+
 src_configure() {
        use clang && llvm_chost_setup
 

diff --git a/dev-qt/qttools/qttools-6.9999.ebuild 
b/dev-qt/qttools/qttools-6.9999.ebuild
index ebf1142f7f02..74e7e707f774 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -62,6 +62,13 @@ DEPEND="
        )
 "
 
+src_prepare() {
+       qt6-build_src_prepare
+
+       # qttools is picky about clang versions and ignores LLVM_SLOT
+       sed -i '/find_package/s/${VERSION}//' cmake/FindWrapLibClang.cmake || 
die
+}
+
 src_configure() {
        use clang && llvm_chost_setup