gentoo auto-resync : 07:01:2025 - 06:41:06

7 files changed, 20 insertions, 340 deletions

diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest
index d662e230727b..1b173620b866 100644
--- a/dev-qt/qttools/Manifest
+++ b/dev-qt/qttools/Manifest
@@ -1,10 +1,6 @@
-DIST qttools-everywhere-src-6.7.2.tar.xz 9019636 BLAKE2B c4324275adddefc2399ce4ff1305d285c9e4bc7fb6cebf6bd310573773ada5cf91f14561b855df685bdcce0a39897c3b9e0b62544083af2794d7eaaf35660146 SHA512 311467d0e6970711b4d984fe792d2b75609f38c04121073d5c3c34c682fcee89787f6982c886e62206a76b1f647de60e56510439b0288f8bd1ae21a2683a37cd
-DIST qttools-everywhere-src-6.7.3.tar.xz 9022820 BLAKE2B e1eafdbc9a08b031a51480733be38e2b217e66b6f66a49e99e603fa0b6ed780164a403c984069cc33819203edd7984b6a1f8dc5af4ebcad94ecc6730f3f1d604 SHA512 c15a76a84e8cea53e8c68b00325acf2cd3fe8097c578f3e96fbb68958453116f02fed25d2811d4485b82f196b988870f0078aea0450c4526523fb8ffacbfae57
 DIST qttools-everywhere-src-6.8.1.tar.xz 10293192 BLAKE2B f670dcbf624dd32a59ad4e29020a46b745f6fc3cfc07b971c7704e7e63719fef3b226abdc9d3b8f9ff054659fde03633c2aa05ae487f12ee4a3ef44db356a252 SHA512 1f5eb44e86d400858abe21efcadb27537ae213127078d95ee56792b57923573e55fd850042e63ca547cd27ba199196fe9956646dcb285c6f6976a22a7832db52
-EBUILD qttools-6.7.2.ebuild 4639 BLAKE2B 68075a61bd1ef704eef58d2614814c711bc1ffdacff4dbbed3efbaff441c8e41a32439d87c96f5cf550538bd1bc0d92cfccee39689c573a81629482ddc6c25b7 SHA512 8bd3eca4671cf40a844a8262a75d474c9d07af7a961c43e89c93cdc85492a5dc57a77c01a3cbfd717ef076871b7f9fb09cec684cca6741097158f0172968e056
-EBUILD qttools-6.7.3.ebuild 4658 BLAKE2B dc796e9a3c31206efa8bc60727d2799f0219fbe9de68746571ead1ac5dd680b1e22fe0c6157ec005b35519679ed41609dd7cf97a9576395cde3d399b831ac8e5 SHA512 0bcb0d9f39a250ab194f83563b4f5e46eb02bc9c8e05a0e46a33897527d6292954bcc9c89d7442cd79bcb7154212006bc8cb74b1e2e509bfc91725fe14f0e5b1
-EBUILD qttools-6.8.1.ebuild 4916 BLAKE2B 9c099fb4a5330c2392cd57fc8c1e6616107e7c69f3147a07ae97845a4a338365e1829efaa80ed888ebe4737fe3539bc7045a4634f333f7db5ffa2b5c380d80ac SHA512 87995ac0fb60efd3ef7b3951d843fd1d94442b9ded11d4118ee58f08235a326a0658279de57885d2a46e279464ec0bd7dc93d71970b13cffc32af42bdcf3e239
-EBUILD qttools-6.8.9999.ebuild 4922 BLAKE2B 674df325b9ef48c0ab230c20e77b2cfd8a9251b3aa854adc605d79bd94d162bd30ba503ab13622cf506a2f1138c67c86d7ce5968edfba7d70ee9dee2092056b4 SHA512 ec898c611c902a599f2ebed031abac2c2f83c0efab2c0a8517687835ddf1c315b969e677d18eecbd7f0d0c8d494b0d51fbb70ee0be28d31f9aa2a89a389034c0
-EBUILD qttools-6.9.9999.ebuild 4922 BLAKE2B 674df325b9ef48c0ab230c20e77b2cfd8a9251b3aa854adc605d79bd94d162bd30ba503ab13622cf506a2f1138c67c86d7ce5968edfba7d70ee9dee2092056b4 SHA512 ec898c611c902a599f2ebed031abac2c2f83c0efab2c0a8517687835ddf1c315b969e677d18eecbd7f0d0c8d494b0d51fbb70ee0be28d31f9aa2a89a389034c0
-EBUILD qttools-6.9999.ebuild 4922 BLAKE2B 674df325b9ef48c0ab230c20e77b2cfd8a9251b3aa854adc605d79bd94d162bd30ba503ab13622cf506a2f1138c67c86d7ce5968edfba7d70ee9dee2092056b4 SHA512 ec898c611c902a599f2ebed031abac2c2f83c0efab2c0a8517687835ddf1c315b969e677d18eecbd7f0d0c8d494b0d51fbb70ee0be28d31f9aa2a89a389034c0
+EBUILD qttools-6.8.1.ebuild 4899 BLAKE2B e293f3e58c6a6e1aedccbe8f4a4e85d13616b2138689119445a62da466eb3201239100c84dc08b086182b35d36eb2ff6e531e33d07f204cf12e1c7e9260069f9 SHA512 a1f3e30960a21da373bd2e0f9c6a7d16311d3db6c0fdbf22659398d02371b50b37a35bda5d10528d2fb49fbde8cf6efbb83623b8edd036c0cc207b58ecad45b2
+EBUILD qttools-6.8.9999.ebuild 4905 BLAKE2B 26e8166ba45fb04cf89347886349c8b2adbd347da48d9496d7b58936244c66fa60a6029078f98776cd166a1a63de86177485785966fbbdbe4f2c714a3a58ef3b SHA512 57be5f025596bd87f41bede74be15fd68350fc2cffc17d588f44c034dcb9bd9de8f5821f7aa21e0decbe62599ba4035ba189777d8ab03d483f3d492c8e332e2d
+EBUILD qttools-6.9.9999.ebuild 4905 BLAKE2B 26e8166ba45fb04cf89347886349c8b2adbd347da48d9496d7b58936244c66fa60a6029078f98776cd166a1a63de86177485785966fbbdbe4f2c714a3a58ef3b SHA512 57be5f025596bd87f41bede74be15fd68350fc2cffc17d588f44c034dcb9bd9de8f5821f7aa21e0decbe62599ba4035ba189777d8ab03d483f3d492c8e332e2d
+EBUILD qttools-6.9999.ebuild 4905 BLAKE2B 26e8166ba45fb04cf89347886349c8b2adbd347da48d9496d7b58936244c66fa60a6029078f98776cd166a1a63de86177485785966fbbdbe4f2c714a3a58ef3b SHA512 57be5f025596bd87f41bede74be15fd68350fc2cffc17d588f44c034dcb9bd9de8f5821f7aa21e0decbe62599ba4035ba189777d8ab03d483f3d492c8e332e2d
 MISC metadata.xml 1495 BLAKE2B 05681d2d714d1d6e2939d105c48c3e16a1a99b4196b04fe0f1ed62cd628f0b3d743d75229aa123c887dfd2abea1e67b43d7224a1603d889f2f75d964f51206b8 SHA512 6c692eed887713ef7a3d33b2644ecfcf0ec2f346e5e15857996b8a6916a137d22cb2255cc2a44de06a4fb1e0818395842c52925b232ac49d7280210d2441f89a
diff --git a/dev-qt/qttools/qttools-6.7.2.ebuild b/dev-qt/qttools/qttools-6.7.2.ebuild
deleted file mode 100644
index 7c2fc972d872..000000000000
--- a/dev-qt/qttools/qttools-6.7.2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
-LLVM_OPTIONAL=1
-
-# behaves very badly when qttools is not already installed, also
-# other issues to handle (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-QT6_RESTRICT_TESTS=1
-
-inherit desktop llvm-r1 optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-fi
-
-IUSE="
-	+assistant clang designer distancefieldgenerator gles2-only
-	+linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
-	qtdiag qtplugininfo vulkan +widgets zstd
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
-REQUIRED_USE="
-	assistant? ( widgets )
-	clang? ( ${LLVM_REQUIRED_USE} )
-	designer? ( qml widgets )
-	distancefieldgenerator? ( qml widgets )
-	pixeltool? ( widgets )
-	qdoc? ( clang qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[network,widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] )
-	clang? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}=
-			llvm-core/llvm:${LLVM_SLOT}=
-		')
-	)
-	designer? (
-		~dev-qt/qtbase-${PV}:6[xml,zstd=]
-		zstd? ( app-arch/zstd:= )
-	)
-	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[gles2-only=,vulkan=] )
-	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
-"
-DEPEND="
-	${RDEPEND}
-	qtdiag? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-"
-
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# prevent the clang test as it can abort due to bug #916098
-		$(cmake_use_find_package clang WrapLibClang)
-		$(cmake_use_find_package qml Qt6Qml)
-		$(cmake_use_find_package widgets Qt6Widgets)
-		$(qt_feature assistant)
-		$(qt_feature clang)
-		$(qt_feature designer)
-		$(qt_feature distancefieldgenerator)
-		$(qt_feature linguist)
-		$(qt_feature pixeltool)
-		$(qt_feature qdbus)
-		$(qt_feature qdoc)
-		$(qt_feature qtattributionsscanner)
-		$(qt_feature qtdiag)
-		$(qt_feature qtplugininfo)
-
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://github.com/litehtml/litehtml/issues/266
-		$(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use widgets; then #914766
-		use designer || use distancefieldgenerator || use pixeltool &&
-			newicon src/designer/src/designer/images/designer.png designer6.png
-
-		if use assistant; then
-			make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \
-				'Qt;Development;Documentation' \
-				'Comment=Tool for viewing online documentation in Qt help file format'
-			newicon src/assistant/assistant/images/assistant-128.png assistant6.png
-		fi
-
-		if use designer; then
-			make_desktop_entry designer6 'Qt 6 Designer' designer6 \
-				'Qt;Development;GUIDesigner' \
-				'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets'
-		fi
-
-		if use distancefieldgenerator; then
-			# no icon, sharing with designer which fits letter-wise
-			make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for pregenerating the font cache of Qt applications'
-		fi
-
-		if use linguist; then
-			make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
-				'Qt;Development;Translation' \
-				'Comment=Tool for translating Qt applications'
-			newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
-		fi
-
-		if use pixeltool; then
-			# no icon, not fitting but share with designer for now
-			make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for zooming in the desktop area pointed by the cursor'
-		fi
-
-		if use qdbus; then
-			make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \
-				'Qt;Development' \
-				'Comment=Tool that lets introspect D-Bus objects and messages'
-			newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png
-		fi
-
-		# hack: make_destop_entry does not support overriding DESCRIPTION
-		find "${ED}" -type f -name "*.desktop" \
-			-exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die
-	fi
-}
-
-pkg_postinst() {
-	use assistant &&
-		optfeature "Qt documentation viewable in assistant" \
-			'dev-qt/qt-docs:6[qch]' #602296
-}
diff --git a/dev-qt/qttools/qttools-6.7.3.ebuild b/dev-qt/qttools/qttools-6.7.3.ebuild
deleted file mode 100644
index 35144aef699c..000000000000
--- a/dev-qt/qttools/qttools-6.7.3.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum
-LLVM_OPTIONAL=1
-
-# behaves very badly when qttools is not already installed, also
-# other issues to handle (clang tests flaky depending on version,
-# and 3rdparty/ tries to FetchContent gtest)
-QT6_RESTRICT_TESTS=1
-
-inherit desktop llvm-r1 optfeature qt6-build
-
-DESCRIPTION="Qt Tools Collection"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv x86"
-fi
-
-IUSE="
-	+assistant clang designer distancefieldgenerator gles2-only
-	+linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner
-	qtdiag qtplugininfo vulkan +widgets zstd
-"
-# note that some tools do not *require* widgets but will skip a sub-tool
-# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6)
-REQUIRED_USE="
-	assistant? ( widgets )
-	clang? ( ${LLVM_REQUIRED_USE} )
-	designer? ( qml widgets )
-	distancefieldgenerator? ( qml widgets )
-	pixeltool? ( widgets )
-	qdoc? ( clang qml )
-"
-
-RDEPEND="
-	~dev-qt/qtbase-${PV}:6[widgets?]
-	assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] )
-	clang? (
-		$(llvm_gen_dep '
-			llvm-core/clang:${LLVM_SLOT}=
-			llvm-core/llvm:${LLVM_SLOT}=
-		')
-	)
-	designer? (
-		~dev-qt/qtbase-${PV}:6[network,xml,zstd=]
-		zstd? ( app-arch/zstd:= )
-	)
-	qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] )
-	qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] )
-	qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] )
-	widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] )
-"
-DEPEND="
-	${RDEPEND}
-	qtdiag? (
-		vulkan? ( dev-util/vulkan-headers )
-	)
-"
-
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# prevent the clang test as it can abort due to bug #916098
-		$(cmake_use_find_package clang WrapLibClang)
-		$(cmake_use_find_package qml Qt6Qml)
-		$(cmake_use_find_package widgets Qt6Widgets)
-		$(qt_feature assistant)
-		$(qt_feature clang)
-		$(qt_feature designer)
-		$(qt_feature distancefieldgenerator)
-		$(qt_feature linguist)
-		$(qt_feature pixeltool)
-		$(qt_feature qdbus)
-		$(qt_feature qdoc)
-		$(qt_feature qtattributionsscanner)
-		$(qt_feature qtdiag)
-		$(qt_feature qtplugininfo)
-
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://github.com/litehtml/litehtml/issues/266
-		$(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON)
-
-		$(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634)
-	)
-
-	qt6-build_src_configure
-}
-
-src_install() {
-	qt6-build_src_install
-
-	if use widgets; then #914766
-		use designer || use distancefieldgenerator || use pixeltool &&
-			newicon src/designer/src/designer/images/designer.png designer6.png
-
-		if use assistant; then
-			make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \
-				'Qt;Development;Documentation' \
-				'Comment=Tool for viewing online documentation in Qt help file format'
-			newicon src/assistant/assistant/images/assistant-128.png assistant6.png
-		fi
-
-		if use designer; then
-			make_desktop_entry designer6 'Qt 6 Designer' designer6 \
-				'Qt;Development;GUIDesigner' \
-				'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets'
-		fi
-
-		if use distancefieldgenerator; then
-			# no icon, sharing with designer which fits letter-wise
-			make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for pregenerating the font cache of Qt applications'
-		fi
-
-		if use linguist; then
-			make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \
-				'Qt;Development;Translation' \
-				'Comment=Tool for translating Qt applications'
-			newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png
-		fi
-
-		if use pixeltool; then
-			# no icon, not fitting but share with designer for now
-			make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \
-				'Qt;Development' \
-				'Comment=Tool for zooming in the desktop area pointed by the cursor'
-		fi
-
-		if use qdbus; then
-			make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \
-				'Qt;Development' \
-				'Comment=Tool that lets introspect D-Bus objects and messages'
-			newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png
-		fi
-
-		# hack: make_destop_entry does not support overriding DESCRIPTION
-		find "${ED}" -type f -name "*.desktop" \
-			-exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die
-	fi
-}
-
-pkg_postinst() {
-	use assistant &&
-		optfeature "Qt documentation viewable in assistant" \
-			'dev-qt/qt-docs:6[qch]' #602296
-}
diff --git a/dev-qt/qttools/qttools-6.8.1.ebuild b/dev-qt/qttools/qttools-6.8.1.ebuild
index 75971ea96c1a..7f580d0836cb 100644
--- a/dev-qt/qttools/qttools-6.8.1.ebuild
+++ b/dev-qt/qttools/qttools-6.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)
diff --git a/dev-qt/qttools/qttools-6.8.9999.ebuild b/dev-qt/qttools/qttools-6.8.9999.ebuild
index 94d7719b638f..8f4634e0ffca 100644
--- a/dev-qt/qttools/qttools-6.8.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.8.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)
diff --git a/dev-qt/qttools/qttools-6.9.9999.ebuild b/dev-qt/qttools/qttools-6.9.9999.ebuild
index 94d7719b638f..8f4634e0ffca 100644
--- a/dev-qt/qttools/qttools-6.9.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)
diff --git a/dev-qt/qttools/qttools-6.9999.ebuild b/dev-qt/qttools/qttools-6.9999.ebuild
index 94d7719b638f..8f4634e0ffca 100644
--- a/dev-qt/qttools/qttools-6.9999.ebuild
+++ b/dev-qt/qttools/qttools-6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2024 Gentoo Authors
+# Copyright 2021-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ LLVM_OPTIONAL=1
 # and 3rdparty/ tries to FetchContent gtest)
 QT6_RESTRICT_TESTS=1
 
-inherit desktop llvm-r1 optfeature qt6-build
+inherit desktop llvm-r2 optfeature qt6-build
 
 DESCRIPTION="Qt Tools Collection"
 
@@ -62,11 +62,9 @@ DEPEND="
 	)
 "
 
-pkg_setup() {
-	use clang && llvm-r1_pkg_setup
-}
-
 src_configure() {
+	use clang && llvm_chost_setup
+
 	local mycmakeargs=(
 		# prevent the clang test as it can abort due to bug #916098
 		$(cmake_use_find_package clang WrapLibClang)