diff options
| -rw-r--r-- | dev-qt/qtdeclarative/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.7.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 4 | ||||
| -rw-r--r-- | profiles/arch/amd64/package.use.mask | 4 | ||||
| -rw-r--r-- | profiles/arch/amd64/package.use.stable.mask | 5 | ||||
| -rw-r--r-- | 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 @@ <flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag> <flag name="network">Enable QtNetwork support</flag> <flag name="opengl">Enable OpenGL support</flag> + <flag name="qmlls">Build the qmlls tool using <pkg>dev-qt/qtlanguageserver</pkg></flag> <flag name="sql">Enable QtSQL support</flag> <flag name="widgets">Enable QtWidgets support</flag> </use> 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 <ionen@gentoo.org> (2024-04-16) +# dev-qt/qtlanguageserver:6 is keyworded here +dev-qt/qtdeclarative:6 -qmlls + # Andrew Ammerlaan <andrewammerlaan@gentoo.org> (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 <ionen@gentoo.org> (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 <andrewammerlaan@gentoo.org> (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 <ionen@gentoo.org> (2024-04-16) +# dev-qt/qtlanguageserver:6 currently has very few keywords +dev-qt/qtdeclarative:6 qmlls + # Mike Gilbert <floppym@gentoo.org> (2024-04-13) # Missing keywords on dev-python/looseversion. sys-fs/fuse:3 test |