commit: 3f82af63c6196e4e9a461f31fbff6eb28c9df9f6
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 5 22:33:24 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 5 22:33:27 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f82af63
qt6-build.eclass: ignore qtwayland for the dependency assert
Oversight, the only one where the qml? is conditional. Could add
fancier logic but feel it's not worth it for compositor bits.
If get an error about "qtwayland depends on qtdeclarative", please
ignore it and --sync.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
eclass/qt6-build.eclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass
index 8af563a432fd..0f65ffe0abc6 100644
--- a/eclass/qt6-build.eclass
+++ b/eclass/qt6-build.eclass
@@ -123,7 +123,8 @@ qt6-build_src_prepare() {
# before (matching) qtdeclarative version is updated despite all these
# packages DEPEND on ~qtdeclarative-${PV}. Tentatively assert to see if
# if the issue really exists (bug #959567).
- if in_iuse qml && use qml && ! has_version -d
"~dev-qt/qtdeclarative-${PV}"
+ if in_iuse qml && use qml && [[ ${PN} != qtwayland ]] &&
+ ! has_version -d "~dev-qt/qtdeclarative-${PV}"
then
eerror "${CATEGORY}/${PN}[qml] depends on
~dev-qt/qtdeclarative-${PV}"
eerror "but it has not been upgraded/installed yet, implies
that there"
