From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1704480-garchives=archives.gentoo.org@lists.gentoo.org> 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 5745B15812D for <garchives@archives.gentoo.org>; Tue, 31 Dec 2024 09:08:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72FABE07AE; Tue, 31 Dec 2024 09:08:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B140E07AE for <gentoo-commits@lists.gentoo.org>; Tue, 31 Dec 2024 09:08:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA0C333BF41 for <gentoo-commits@lists.gentoo.org>; Tue, 31 Dec 2024 09:08:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D864E194F for <gentoo-commits@lists.gentoo.org>; Tue, 31 Dec 2024 09:08:42 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1735636064.3cc755261c0d4185edb70b844c82d009baff1bae.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-build/cmake/cmake-9999.ebuild X-VCS-Directories: dev-build/cmake/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3cc755261c0d4185edb70b844c82d009baff1bae X-VCS-Branch: master Date: Tue, 31 Dec 2024 09:08:42 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8cb860c8-4e76-40cf-96cf-ae742e337cbd X-Archives-Hash: 8fc554497f4d431c2ae32bf3bba71a85 commit: 3cc755261c0d4185edb70b844c82d009baff1bae Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Dec 30 19:18:31 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Dec 31 09:07:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc75526 dev-build/cmake: Drop IUSE qt6 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-build/cmake/cmake-9999.ebuild | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild index 33cdd6eb2848..5a40196b5ee1 100644 --- a/dev-build/cmake/cmake-9999.ebuild +++ b/dev-build/cmake/cmake-9999.ebuild @@ -26,7 +26,7 @@ MY_P="${P/_/-}" DESCRIPTION="Cross platform Make" HOMEPAGE="https://cmake.org/" -if [[ ${PV} == 9999 ]] ; then +if [[ ${PV} == *9999* ]] ; then CMAKE_DOCS_PREBUILT=0 EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" @@ -59,7 +59,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses test" RESTRICT="!test? ( test )" RDEPEND=" @@ -72,14 +72,7 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig dap? ( dev-cpp/cppdap ) - gui? ( - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - qt6? ( dev-qt/qtbase:6[gui,widgets] ) - ) + gui? ( dev-qt/qtbase:6[gui,widgets] ) ncurses? ( sys-libs/ncurses:= ) " DEPEND="${RDEPEND}" @@ -244,7 +237,7 @@ src_configure() { -DBUILD_QtDialog=$(usex gui) ) - use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) ) + use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 ) cmake_src_configure }