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

[Ionen Wolkens]

commit:     658ed12de0599835536f9d4524d5dea76d57d4b9
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 04:15:12 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=658ed12d

dev-qt/qt-creator: 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 (which will be python's).

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

 dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild | 11 ++++-------
 dev-qt/qt-creator/qt-creator-9999.ebuild      | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild 
b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
index 80029092f457..1e47f995104b 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
 inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -105,11 +105,6 @@ PATCHES=(
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
 
-pkg_setup() {
-       python-any-r1_pkg_setup
-       use clang && llvm-r1_pkg_setup
-}
-
 src_unpack() {
        if [[ ${PV} == 9999 ]]; then
                git-r3_src_unpack
@@ -142,6 +137,8 @@ src_prepare() {
 }
 
 src_configure() {
+       use clang && llvm_chost_setup
+
        if use cmdbridge-server; then
                go-env_set_compile_environment
                local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild 
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index a68584bdc223..2b586e25fae8 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit cmake edo flag-o-matic go-env llvm-r2 multiprocessing
 inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
@@ -104,11 +104,6 @@ PATCHES=(
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
 
-pkg_setup() {
-       python-any-r1_pkg_setup
-       use clang && llvm-r1_pkg_setup
-}
-
 src_unpack() {
        if [[ ${PV} == 9999 ]]; then
                git-r3_src_unpack
@@ -141,6 +136,8 @@ src_prepare() {
 }
 
 src_configure() {
+       use clang && llvm_chost_setup
+
        if use cmdbridge-server; then
                go-env_set_compile_environment
                local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false 
-buildmode=pie"