mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-qt/qtdeclarative: depend on qtbase[wayland=]
Debated doing it live-only for now to avoid rebuilds that are (for most) unnecessary and then deploy it next release, but we're about to stabilize 6.11.2 and may as well include the change prior. If any users are hitting weird USE suggestions or conflicts and don't know what's going on (portage is bad at [flag=] suggestions), make sure that USE=wayland is either set on both qtbase and qtdeclarative or unset on both. Closes: https://bugs.gentoo.org/982439 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
@@ -16,10 +16,13 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
|
||||
IUSE="
|
||||
accessibility +jit +network opengl qmlls +sql +ssl svg vulkan
|
||||
wayland +widgets
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,wayland=,widgets=]
|
||||
qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
|
||||
svg? ( ~dev-qt/qtsvg-${PV}:6 )
|
||||
"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2021-2025 Gentoo Authors
|
||||
# Copyright 2021-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -16,10 +16,13 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
|
||||
IUSE="
|
||||
accessibility +jit +network opengl qmlls +sql +ssl svg vulkan
|
||||
wayland +widgets
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,wayland=,widgets=]
|
||||
qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
|
||||
svg? ( ~dev-qt/qtsvg-${PV}:6 )
|
||||
"
|
||||
|
||||
@@ -16,10 +16,13 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
|
||||
IUSE="
|
||||
accessibility +jit +network opengl qmlls +sql +ssl svg vulkan
|
||||
wayland +widgets
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,wayland=,widgets=]
|
||||
qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
|
||||
svg? ( ~dev-qt/qtsvg-${PV}:6 )
|
||||
"
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Copyright 2021-2025 Gentoo Authors
|
||||
# Copyright 2021-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@@ -16,10 +16,13 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
|
||||
fi
|
||||
|
||||
IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets"
|
||||
IUSE="
|
||||
accessibility +jit +network opengl qmlls +sql +ssl svg vulkan
|
||||
wayland +widgets
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=]
|
||||
~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,wayland=,widgets=]
|
||||
qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 )
|
||||
svg? ( ~dev-qt/qtsvg-${PV}:6 )
|
||||
"
|
||||
|
||||
Reference in New Issue
Block a user