From 0eeae022ca567f74f86c9a04a14b829e7808b3fc Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Sun, 13 Sep 2026 03:18:36 -0400 Subject: [PATCH] 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 --- dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild | 7 +++++-- dev-qt/qtdeclarative/qtdeclarative-6.11.9999.ebuild | 9 ++++++--- dev-qt/qtdeclarative/qtdeclarative-6.12.9999.ebuild | 7 +++++-- dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild | 9 ++++++--- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild index 24eb49b7d5ae9..027b333e3efda 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.11.2-r1.ebuild @@ -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 ) " diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.11.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.11.9999.ebuild index eb34cbcde7260..81dc1aa9527a2 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.11.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.11.9999.ebuild @@ -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 ) " diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.12.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.12.9999.ebuild index 40fff605ebe2e..81dc1aa9527a2 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.12.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.12.9999.ebuild @@ -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 ) " diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild index eb34cbcde7260..81dc1aa9527a2 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.9999.ebuild @@ -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 ) "