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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ADD2415815E for ; Sat, 10 Feb 2024 11:26:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE4572BC024; Sat, 10 Feb 2024 11:26:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 979292BC024 for ; Sat, 10 Feb 2024 11:26:05 +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 C94E53431D7 for ; Sat, 10 Feb 2024 11:26:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3644F14C5 for ; Sat, 10 Feb 2024 11:26:03 +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: <1707564302.d519e0ecfb408e50e11f6f3c592a2e9d521c3395.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qt-creator/qt-creator-9999.ebuild X-VCS-Directories: dev-qt/qt-creator/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: d519e0ecfb408e50e11f6f3c592a2e9d521c3395 X-VCS-Branch: master Date: Sat, 10 Feb 2024 11:26:03 +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: 6fa2ac23-ef86-4b70-8af4-627b315b9926 X-Archives-Hash: 5194646b61b9d0fe9241a427418dccfc commit: d519e0ecfb408e50e11f6f3c592a2e9d521c3395 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 9 11:43:42 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Feb 10 11:25:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d519e0ec dev-qt/qt-creator: migrate live to llvm-r1, allow slot 18 Tested with 18.1.0_rc2 at same time, seems to be fine so may as well do this now. Will migrate 12.0.2 when add Qt6.6.2 given that will trigger a rebuild either way. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qt-creator/qt-creator-9999.ebuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild index a2c7444d9223..4587a1c7c566 100644 --- a/dev-qt/qt-creator/qt-creator-9999.ebuild +++ b/dev-qt/qt-creator/qt-creator-9999.ebuild @@ -3,8 +3,10 @@ EAPI=8 +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg +inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -35,9 +37,9 @@ IUSE=" +clang +designer doc +help qmldesigner serialterminal +svg test +tracing webengine " +REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )" RESTRICT="!test? ( test )" -LLVM_MAX_SLOT=17 QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN # := is used where Qt's private APIs are used for safety @@ -47,7 +49,7 @@ COMMON_DEPEND=" >=dev-qt/qtdeclarative-${QT_PV}= clang? ( dev-cpp/yaml-cpp:= - =dev-qt/qttools-${QT_PV}[designer] ) help? ( @@ -84,13 +86,9 @@ PATCHES=( "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch ) -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} - pkg_setup() { python-any-r1_pkg_setup - use clang && llvm_pkg_setup + use clang && llvm-r1_pkg_setup } src_prepare() {