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

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     1ae87c7d88b76d82c38c675ed990599c6e8cd2b1
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 02:49:34 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 07:04:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae87c7d

dev-qt/qttools: migrate to llvm-r2.eclass

Given pkg_setup is not exported with LLVM_OPTIONAL, may as
well use llvm_chost_setup directly in src_configure rather
than define pkg_setup.

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

 dev-qt/qttools/qttools-6.8.1.ebuild    | 10 ++++------
 dev-qt/qttools/qttools-6.8.9999.ebuild | 10 ++++------
 dev-qt/qttools/qttools-6.9.9999.ebuild | 10 ++++------
 dev-qt/qttools/qttools-6.9999.ebuild   | 10 ++++------
 4 files changed, 16 insertions(+), 24 deletions(-)

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)