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 0B203158043 for ; Tue, 16 Apr 2024 12:02:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E735CE2A08; Tue, 16 Apr 2024 12:02:34 +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 CCEABE2A07 for ; Tue, 16 Apr 2024 12:02:34 +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 0CB943433DF for ; Tue, 16 Apr 2024 12:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FC7216FB for ; Tue, 16 Apr 2024 12:02:32 +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: <1713268895.beac6639812c50efb879b0ff375015f06afedde6.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/, profiles/arch/base/, dev-qt/qtdeclarative/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtdeclarative/metadata.xml dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild profiles/arch/amd64/package.use.mask profiles/arch/amd64/package.use.stable.mask profiles/arch/base/package.use.mask X-VCS-Directories: dev-qt/qtdeclarative/ profiles/arch/base/ profiles/arch/amd64/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: beac6639812c50efb879b0ff375015f06afedde6 X-VCS-Branch: master Date: Tue, 16 Apr 2024 12:02:32 +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: 02cfc139-fe6d-4e68-bc19-fa09e3b60fd1 X-Archives-Hash: 43a0c1094cd775e2157549592f00b6b9 commit: beac6639812c50efb879b0ff375015f06afedde6 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Apr 16 11:29:17 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Apr 16 12:01:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beac6639 dev-qt/qtdeclarative: add IUSE=qmlls for same-named user-facing tool Masked in stable for now, will stabilize qtlanguageserver-6.7.0 in a few days to match the rest. Was automagic before but don't really need to revbump given the required package wasn't in the tree and fairly harmless even if someone had it from elsewhere. Closes: https://bugs.gentoo.org/930106 Signed-off-by: Ionen Wolkens gentoo.org> dev-qt/qtdeclarative/metadata.xml | 1 + dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild | 4 +++- dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild | 4 +++- dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 4 +++- profiles/arch/amd64/package.use.mask | 4 ++++ profiles/arch/amd64/package.use.stable.mask | 5 +++++ profiles/arch/base/package.use.mask | 4 ++++ 7 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 2d0b3fc41d29..b6df94c4541c 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -9,6 +9,7 @@ Build the LocalStorage import for QtQuick (requires QtSql) Enable QtNetwork support Enable OpenGL support + Build the qmlls tool using dev-qt/qtlanguageserver Enable QtSQL support Enable QtWidgets support diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild index c82795f0d0f5..6385d3746191 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild @@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets" +IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) @@ -20,6 +20,7 @@ RESTRICT="test" RDEPEND=" ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) svg? ( ~dev-qt/qtsvg-${PV}:6 ) " DEPEND=" @@ -33,6 +34,7 @@ BDEPEND=" src_configure() { local mycmakeargs=( + $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) $(cmake_use_find_package sql Qt6Sql) $(cmake_use_find_package svg Qt6Svg) $(qt_feature network qml_network) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild index b87689b35832..64a1db661828 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild @@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets" +IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) @@ -20,6 +20,7 @@ RESTRICT="test" RDEPEND=" ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) svg? ( ~dev-qt/qtsvg-${PV}:6 ) " DEPEND=" @@ -33,6 +34,7 @@ BDEPEND=" src_configure() { local mycmakeargs=( + $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) $(cmake_use_find_package sql Qt6Sql) $(cmake_use_find_package svg Qt6Svg) $(qt_feature network qml_network) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index b87689b35832..64a1db661828 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -12,7 +12,7 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi -IUSE="accessibility +network opengl +sql +ssl svg vulkan +widgets" +IUSE="accessibility +network opengl qmlls +sql +ssl svg vulkan +widgets" # behaves very badly when qtdeclarative is not already installed, also # other more minor issues (installs junk, sandbox/offscreen issues) @@ -20,6 +20,7 @@ RESTRICT="test" RDEPEND=" ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] + qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) svg? ( ~dev-qt/qtsvg-${PV}:6 ) " DEPEND=" @@ -33,6 +34,7 @@ BDEPEND=" src_configure() { local mycmakeargs=( + $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) $(cmake_use_find_package sql Qt6Sql) $(cmake_use_find_package svg Qt6Svg) $(qt_feature network qml_network) diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask index b50df1912e5b..4bfc5b436937 100644 --- a/profiles/arch/amd64/package.use.mask +++ b/profiles/arch/amd64/package.use.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Ionen Wolkens (2024-04-16) +# dev-qt/qtlanguageserver:6 is keyworded here +dev-qt/qtdeclarative:6 -qmlls + # Andrew Ammerlaan (2024-03-17) # virt-firmware is keyworded here sys-kernel/installkernel -efistub diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index 233f44877170..6309d1e2f77b 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -17,6 +17,11 @@ #--- END OF EXAMPLES --- +# Ionen Wolkens (2024-04-16) +# Temporary mask to give a little bit of time before stabilizing +# the just added dev-qt/qtlanguageserver-6.7.0 for amd64 +dev-qt/qtdeclarative:6 qmlls + # Andrew Ammerlaan (2024-03-17) # Experimental, virt-firmware is keyworded only unstable sys-kernel/installkernel efistub diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 2531ef261766..349a06227d1b 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Ionen Wolkens (2024-04-16) +# dev-qt/qtlanguageserver:6 currently has very few keywords +dev-qt/qtdeclarative:6 qmlls + # Mike Gilbert (2024-04-13) # Missing keywords on dev-python/looseversion. sys-fs/fuse:3 test