From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 518B215812D for ; Mon, 06 Jan 2025 07:05:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 834FEE079C; Mon, 06 Jan 2025 07:05:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67A8CE079C for ; Mon, 06 Jan 2025 07:05:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C4DE335C2E for ; Mon, 06 Jan 2025 07:05:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBB85AED for ; Mon, 06 Jan 2025 07:05:38 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1736147085.1ae87c7d88b76d82c38c675ed990599c6e8cd2b1.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qttools/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qttools/qttools-6.8.1.ebuild dev-qt/qttools/qttools-6.8.9999.ebuild dev-qt/qttools/qttools-6.9.9999.ebuild dev-qt/qttools/qttools-6.9999.ebuild X-VCS-Directories: dev-qt/qttools/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 1ae87c7d88b76d82c38c675ed990599c6e8cd2b1 X-VCS-Branch: master Date: Mon, 06 Jan 2025 07:05:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b38bbfb-f0b1-4d92-8168-6f55ec023824 X-Archives-Hash: fcfa979515bdc5e7427f950b57dbe2eb commit: 1ae87c7d88b76d82c38c675ed990599c6e8cd2b1 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Jan 6 02:49:34 2025 +0000 Commit: Ionen Wolkens gentoo 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 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)