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 717BC15815E 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 95DB62BC022; 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 7949F2BC022 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 AD5E63431CE 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 2035A1082 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: <1707564284.930c2dbfeee49f7a1210af8f619a3ab64df723b9.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.6.9999.ebuild dev-qt/qttools/qttools-6.7.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: 930c2dbfeee49f7a1210af8f619a3ab64df723b9 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: 8adb2b78-2fb3-46fc-b6cc-3c81e468642a X-Archives-Hash: 9e18501dc0be1126923be86aa42a607a commit: 930c2dbfeee49f7a1210af8f619a3ab64df723b9 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 9 10:15:34 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Feb 10 11:24:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930c2dbf dev-qt/qttools: 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. Skip .cmake.conf comment in 6.6.9999 given the minimum was introduced in 6.7+. Unsure how often Qt intend to bump this, odds are we may not need to pay attention to it if we clean old versions up faster. Not changing 6.6.1 given 6.6.2 is close and it can be updated at same time to spare rebuilds. Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qttools/qttools-6.6.9999.ebuild | 19 +++++++++++-------- dev-qt/qttools/qttools-6.7.9999.ebuild | 19 +++++++++---------- dev-qt/qttools/qttools-6.9999.ebuild | 19 +++++++++---------- 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dev-qt/qttools/qttools-6.6.9999.ebuild b/dev-qt/qttools/qttools-6.6.9999.ebuild index 9f6085643a94..49dfe820f8ac 100644 --- a/dev-qt/qttools/qttools-6.6.9999.ebuild +++ b/dev-qt/qttools/qttools-6.6.9999.ebuild @@ -3,7 +3,9 @@ EAPI=8 -inherit desktop llvm optfeature qt6-build +LLVM_COMPAT=( {15..18} ) +LLVM_OPTIONAL=1 +inherit desktop llvm-r1 optfeature qt6-build DESCRIPTION="Qt Tools Collection" @@ -20,6 +22,7 @@ IUSE=" # 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 ) @@ -31,11 +34,15 @@ REQUIRED_USE=" # and 3rdparty/ tries to FetchContent gtest) RESTRICT="test" -LLVM_MAX_SLOT=17 RDEPEND=" ~dev-qt/qtbase-${PV}:6[network,widgets?] assistant? ( ~dev-qt/qtbase-${PV}:6[sql,sqlite] ) - clang? (