gentoo resync : 20.03.2022

27 files changed, 481 insertions, 298 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index a6fe2100be3a..f695f8b468ac 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 271dfe086082..2caa8be61843 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,6 +1,4 @@
-DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
 DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb
-EBUILD qt-creator-4.15.1.ebuild 7209 BLAKE2B f4fc67fa5ff3548a1751478d17d292c883e463d083f1fd59b7785c3c8f6a818746df4eb4cca1ebf38751e24bcc15e08d87cd2e710002496472eaccedbd77589c SHA512 64c89d041808b92d31077c8e24d9727902b653c20fc3f268c337461a97e111259cfb76dbb62329945036f56f09d542048e303122ff286335b215f45f47cd4c02
 EBUILD qt-creator-6.0.0.ebuild 7282 BLAKE2B 2935b4c5ca4e9d107a4f47aa67c1188a23ac634c50fa3a04e859a66513d532b1073fe5583738461212ef4472056477e816d5d04bf83c6877f1d47719bae14800 SHA512 023c98bba47ec6fa272873651601e010aee2682941a5597c6a24dbe37a1405f571e20c1f4369c8f8a061d4010e6a833dde03a101fa35b2556fbeb8fe85c1a038
 EBUILD qt-creator-9999.ebuild 7282 BLAKE2B 2935b4c5ca4e9d107a4f47aa67c1188a23ac634c50fa3a04e859a66513d532b1073fe5583738461212ef4472056477e816d5d04bf83c6877f1d47719bae14800 SHA512 023c98bba47ec6fa272873651601e010aee2682941a5597c6a24dbe37a1405f571e20c1f4369c8f8a061d4010e6a833dde03a101fa35b2556fbeb8fe85c1a038
-MISC metadata.xml 3881 BLAKE2B e70f7f66fd52b5e9a0526d4cc902289d7a1a94933f741d3a941d53aa3a2534dfb24942a952931b221750755a5793f458803f6f86dd958052f5a1982d69d6025b SHA512 0f06152dc28ce8b8a15dd80a46aff37088b4383dd50f609e5da075a88d3c14a3304c9b3e40c7315fd448d08138148d68dcac3dafd294a7c266d9f0ba879d1b5f
+MISC metadata.xml 3738 BLAKE2B d86570b10db9808d6bd40051ef1b857615947f8cdd8262edf0a9eeaa0fc76e7302ecae1dc67337b1144def6109dd2e18bbe7cf64dfebc88cca4e1cd08f1a2bcd SHA512 d4b499974c355d7302a14b34f9f8d237fa1d6a6d39d1a45f9e60d2cc3211822c1cb19b2e7e0df30590cb18067c814cfd4613e56f2551726fe089ff3b4830d597
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index d2e6af3e1338..51e112b750a3 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -40,8 +40,6 @@
 		<flag name="qbs">Build plugin for Qbs-based projects</flag>
 		<flag name="qmake">Build plugin for qmake-based projects</flag>
 		<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag>
-		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
-		<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
 		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="remotelinux">Build plugin for deployment and execution on a remote Linux host</flag>
diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
deleted file mode 100644
index 18260cba5420..000000000000
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-opensource-src-${MY_PV}
-	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	S=${WORKDIR}/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
-	modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
-	+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
-	subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	android? ( lsp )
-	boot2qt? ( remotelinux )
-	clang? ( test? ( qbs ) )
-	mcu? ( baremetal cmake )
-	python? ( lsp )
-	qmldesigner? ( qmljs )
-	qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.14:5"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-CDEPEND="
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquickcontrols-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtx11extras-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	kde-frameworks/syntax-highlighting:5
-	clang? (
-		>=dev-cpp/yaml-cpp-0.6.2:=
-		|| (
-			sys-devel/clang:12
-			sys-devel/clang:11
-		)
-		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-	)
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	perfprofiler? ( dev-libs/elfutils )
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[python]
-	autotools? ( sys-devel/autoconf )
-	cmake? ( >=dev-util/cmake-3.14 )
-	cppcheck? ( dev-util/cppcheck )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	qbs? ( >=dev-util/qbs-1.18 )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-	silversearcher? ( sys-apps/the_silver_searcher )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	IUSE+=" l10n_${x}"
-	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-	sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
-	sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die
-
-	# avoid building unused support libraries and tools
-	if ! use clang; then
-		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
-		sed -i -e '/clangbackend/d' src/tools/tools.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use lsp; then
-		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
-	fi
-	if ! use perfprofiler; then
-		rm -r src/tools/perfparser || die
-		if ! use ctfvisualizer && ! use qmlprofiler; then
-			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
-		fi
-	fi
-	if ! use qmldesigner; then
-		sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die
-		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
-	fi
-	if ! use qmljs; then
-		sed -i -e '/qmleditorwidgets/d' src/libs/libs.pro || die
-	fi
-	if ! use valgrind; then
-		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
-		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
-
-	# do not install test binaries
-	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
-
-	# fix path to some clang headers
-	sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
-
-	# fix translations
-	local lang languages=
-	for lang in ${PLOCALES}; do
-		use l10n_${lang} && languages+=" ${lang/-/_}"
-	done
-	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
-
-	# remove bundled syntax-highlighting
-	rm -r src/libs/3rdparty/syntax-highlighting || die
-
-	# remove bundled yaml-cpp
-	rm -r src/libs/3rdparty/yaml-cpp || die
-
-	# remove bundled qbs
-	rm -r src/shared/qbs || die
-
-	# TODO: unbundle sqlite
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1)
-}
-
-src_test() {
-	cd tests/auto && virtx default
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}/usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		# don't use ${PF} or the doc will not be found
-		insinto /usr/share/doc/qtcreator
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
-	fi
-}
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index d0f6c937d770..6ccda6aeeb6a 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,3 +1,3 @@
 DIST qt3d-5.15.2-dba14d48.tar.gz 86196833 BLAKE2B b5a2333d890dab3b28d0cd1e47b217ff1bc2f772b3477650263e1754ad4e06a63d026350c5daf07e171bd64e097c847c65a8f5f6a538a8ddc9db20a8df2f7b20 SHA512 eb61c94c5438c9e68253958c0fcc60ec7592916e7fc08f723a4218bc24ce5536b25df5f46c97fd86ed19de2b0851a31779fbfdb7c23c70323338a98bbc77a650
-EBUILD qt3d-5.15.2-r11.ebuild 1000 BLAKE2B 0448180dd4d1c8c0dd13a13fc84b9a8c7a65b8c0bb9ba08053b9c7b58e4f9783669e734080c1cc679449e9a4468c3b2979999441fab754800f6d379fc6255374 SHA512 6effa71abc457165994072f8eb75ad37ffa7f0481158a3bb1ed36a38b529603491af0499cb19c65e982b4a6f687d45e0e7ee4e7c5f8320eca1759d879c7acf0a
+EBUILD qt3d-5.15.2-r11.ebuild 1005 BLAKE2B 584be35e30231c285df2d668321538480dc9e1ff831922ad55d4c9846d4922bccffc338febd6cee850155b6a0229a8dae5d7f94d55decc9beb57f9a1fb9389e2 SHA512 38499295b02fd2b1abe358ea8156de91aa7262bb04017119d7851714de3d754c1fb11731a1ea6f3eb85198c1f17f181844931c444080f51930e945b16c6c7549
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild
index 8439faf77950..e91c1ff98408 100644
--- a/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 # TODO: tools
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index f92577caf785..03ee92ae1d82 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,3 +1,3 @@
 DIST qtdatavis3d-everywhere-src-5.15.2.tar.xz 5191436 BLAKE2B 2c319d7569f4dd62711f4de23661413f6d1a19ef1653543506afcdb455875447cb84980d780fefdb677f0856075e0b1df4525662bed92ae9b6272f91112c8f58 SHA512 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3
-EBUILD qtdatavis3d-5.15.2-r1.ebuild 657 BLAKE2B 738bcc293a87cc22fb62ab7751300b9d43d5e5d4d885098cb724776021d316cf008bcf8166282067f340dbf707d09fa169ce906b11b330ed37789e24c280756f SHA512 0c9884115559c5d97e98a530b2f817bf7fd126cde789e34bac71b87af1148ae38ac10fcf957b0a39c3bf4a8f32ebd936299185852f31c1e61c2ea02ddc5de372
+EBUILD qtdatavis3d-5.15.2-r1.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
index 4963f2fe39af..4ac3606b0fd2 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 6e80cc0c893e..aef4142b8220 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,6 +1,8 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
 AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
+DIST qtdeclarative-5.15.2-29ee9a0e.tar.gz 24346706 BLAKE2B 5bd518a61aaa24672164fad41599ca6cc4ed7e8ab3eac56d8a38d9b0d892f92ddc3e4f7a6a66c16043d1eb29578602a91824413283fdcf971bbfaf95e0a59af0 SHA512 7964cf301f8cceb01cc4eaa7b3a5bc1e882633f61abcd250fee6dc27110baa4e32622d0b24e2cdc3874b0518c79f6f42fa1ac434535270af3b35081e663d8cd4
 DIST qtdeclarative-5.15.2-7024ac83.tar.gz 24346858 BLAKE2B 75a6a36fcf39bdf38292af1fe10b0f5bf3e72b39c8403fdbfed9c0c0a739919d93592157cf8d8f33523e8db52662f1f7d63209d173730b4c06045e9c1f0a4563 SHA512 8be70e68abd035a43ecfab7a1e23969428abf9425558875b8ee5e24a45a563afbef30d0852b495ab918b22118fa88877bb6d390cf90a928b02c96ee1e77f2331
 EBUILD qtdeclarative-5.15.2-r14.ebuild 1424 BLAKE2B 949605f78fa848d528c4a26d07a1340adaffc46eb0de78bc5fd9286add9de1f5cd07958cbc984935f2c5635e1fcc4db20dc2fc45fd8edc87f2e2a89173284102 SHA512 1bd65cad412b4d001f53decd670cc9e2437ea1980a5f7ac118e9950c24cd5eea825ab88679a59ad2cbd8c71e2543f93ae5d087967166b0994e276f74fda491d7
+EBUILD qtdeclarative-5.15.2-r15.ebuild 1424 BLAKE2B 57a37412c09412e489c5ff9953e9c20044eeec2f8b1f9749206d194d7af903467d897ad8decbddc8f5d0f3716eb8f9b790e06dc5718df1bb747804e8879402df SHA512 3c32ec37e76dc3f4a198966e50d050f805594201dd4f05c761f8c3ca85c04ca9bbfe4177feb22fd84139d20b3521266ebb772738b86ddcb3b61cc6327f02ba55
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild
new file mode 100644
index 000000000000..3cb34cce0fa0
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2009-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=29ee9a0e9f02ec74153a2cf09dc63722bc273544
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+fi
+
+IUSE="gles2-only +jit localstorage vulkan +widgets"
+
+# qtgui[gles2-only=] is needed because of bug 504322
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
+	=dev-qt/qtnetwork-${QT5_PV}*
+	=dev-qt/qttest-${QT5_PV}*
+	media-libs/libglvnd
+	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
+	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
+	"${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
+)
+
+src_prepare() {
+	use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
+
+	qt_use_disable_mod localstorage sql \
+		src/imports/imports.pro
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/qmltest/qmltest.pro \
+		tests/auto/auto.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt5-build_src_prepare
+}
+
+src_configure() {
+	local myqmakeargs=(
+		--
+		-qml-debug
+	)
+	qt5-build_src_configure
+}
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index f831464e29de..c0d3c4985a75 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,3 +1,3 @@
 DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1
-EBUILD qtgamepad-5.15.2-r1.ebuild 711 BLAKE2B a41760d44e6661082277b38aad6d26b2f8ba489060b58d83b5a68dc4de11dca5cf97a708984e227296cc392e793bf25d790400439cd7351e589bd80aa30b89d2 SHA512 4761581eae4b40756f472e1da1f5e1c9c25eec51896c2d1974d25ee3249f4c25f1d98c56af81ef45cfaaf5162a121d408010808073c64eb19a0783e832a12674
+EBUILD qtgamepad-5.15.2-r1.ebuild 716 BLAKE2B 2089d55972aea42e990cf5f5695cf1e4a3821078a7486ee60afca8cde33d36ba2526aea3483f65b66c13fae3c64944cf829dcc79aea5d685f9b0aa536ed2faba SHA512 be8e5d71b4ddbdf32dc825e5d4640d961623e1eb0de05f806107c1034feb90ba12289988eedc0110a9e959347b1598b1e46ada47e50da79cd8c416e1a34e2eac
 MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
index 240fb4f4e8b0..fc5b9a4214bb 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt module to support gamepad hardware"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 IUSE="evdev qml sdl"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 83a43961116d..11ee13c68711 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,5 +1,3 @@
-DIST qtquickcontrols2-5.15.2-b092b19a.tar.gz 9243309 BLAKE2B 9e66abbafd17612beffec37e69b7ec0fbf3f6a2ea7586485d6db42d03836423a5dbcfb2ea7e7dc365b852bd6aaa9fd225a0b299daec8c9ee9c8491718214707a SHA512 cae966daa42eec031a5fb8a217a8cca6c6f58e6fa2db7ef016dc852114edbfaafa3a25c7bfdf070428b37ba4eabe732eacb731994b1d8bcc038b4a3bbff830bb
-DIST qtquickcontrols2-5.15.2-be66bf9a.tar.gz 9243427 BLAKE2B 7fcb46a69b8ea5a149f489b8ef6302185976fcf2a1afbcc19a05156647e00e037c9b447d763f0e1055464ece9bef0daa12e1b094d91d61c1a20f06727c232ae2 SHA512 7edfacbab302e3e0492d7bdf2b2b761818104452be95e20d52e2bc2649ca684ffb7e6ce709ed47ef6072b965cd63e7943746b193ec3a959dbb9a5540cc5a7567
-EBUILD qtquickcontrols2-5.15.2-r11.ebuild 695 BLAKE2B 7ec9449ac8f30acd8f8f464909e50101fb9fd15b3535dab61d9739419d1335172fda8791a9bc1a2eca30a497b6e9937f3534ef5bd099bea1a3d8ad3297c97cc4 SHA512 c0317dd97c14333bea2b83970d1b03aec02aa3c7be0a5b64e958f7d33166cf54d8c9b0e496bb0a255f7bc8f98373e4ca3b7235dab8396948785915d36a07cb52
-EBUILD qtquickcontrols2-5.15.2-r12.ebuild 698 BLAKE2B bbfda0ea102f6e44cd2f8759c75be01e12f6df404a8454fc0ba6509e1302a0c7ec372dbdc2bf8b60eb9088bb5d3d7ab16dbc1b76de45d31df77551497b2b0c17 SHA512 b75fb44fc78408c23e1d7c17062eb250f92b73e9202b4736b5cee4da4b1d8b8d1db3e45201c5f98f75ffca666ad34ad6bbaceb8ceb2001b307feaa0798c7a7f8
+DIST qtquickcontrols2-5.15.2-d8d6b14b.tar.gz 9243417 BLAKE2B bb7ef475b555f50b056be7b12196180a87bc59b64aa8dc7fb857ca532eff1f611dfc6c921c451d2ddd23a3b435689ba8a651f77db39d2a7d23f8e4ac66394c14 SHA512 d2e596746b9c05331397b290fe2e810c371adcdcc84b66ec1d5ab99dbb992f739dcab8605f5780bf10cf3fe9e7d185aa036c50abd170c0a56082f28c7bb45320
+EBUILD qtquickcontrols2-5.15.2-r13.ebuild 695 BLAKE2B 6b2b3678905c46e735ea17b5180e3782bcc583625849865f792227ff26815598584fb2cb0674a2d8b07c1fec932e35b219d839e10f238241b0d62cfe2fd83d45 SHA512 982a58ec94d878ed3b64159545d6d0196e6bc21150dda4060567a717caacad54b86401d3fef4f4ca586cdc401b2e2a64feae4ef00f582c8d64c6574c1065dc49
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r12.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r12.ebuild
deleted file mode 100644
index effe14d8cd02..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=b092b19a18d14e70beae6afebc6bde5d83e9eed7
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-IUSE="widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}
-	=dev-qt/qtgraphicaleffects-${QT5_PV}*
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r13.ebuild
index 19bc097b0b49..fd70626eabcd 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r11.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-KDE_ORG_COMMIT=be66bf9a5618c745d2a6ee2262967af6307b3b07
+KDE_ORG_COMMIT=d8d6b14b9907adbc6ce307d52be34aaa761a58fa
 inherit qt5-build
 
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 261bdd1f0dce..4d9c11e79e50 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,3 +1,3 @@
 DIST qtscxml-everywhere-src-5.15.2.tar.xz 434204 BLAKE2B 8deaa46eb784690937160470b20dc01ae1b2ee80be89f1f19a22e1e2f2252d3d33427e96bb97b4ec8033b54a78c2a73e3b00fe3bbbe061e9b9bfb299801847fe SHA512 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8
-EBUILD qtscxml-5.15.2-r1.ebuild 393 BLAKE2B f10a0aef81c281b9c8a5c907c5e0b06a21d27bfe63775db654358df64a168143c3b7bf933f90d9bfab0b2a15a2c0c07fd6dd022467e1b7787270527506179ec7 SHA512 2a3daaf6385f271baf70ea9cdd5e094d0618321e109d812ee87d32447baac5debb7104764f0be43de6f18c44346ae72bf8244e1a4113b1c50a6a24ad7e41790a
+EBUILD qtscxml-5.15.2-r1.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild b/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
index 868a3450c832..a778e477a992 100644
--- a/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 2e4e4e840233..2c5c7dc34c2a 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,3 +1,3 @@
-DIST qtspeech-everywhere-src-5.15.2.tar.xz 101940 BLAKE2B 0b100fddac7bc880b79914be54a8618e3e31e9a2486e8cd4ab9f65eabaec605d9aba7c66f71569466798b9cc94e97a2e136868a6f8eda3208f9d0a9515e71ac9 SHA512 78a13218a639276c9b253566a1df52e2363847eac76df3962ba2a7178800206beb57859d22c7c99fa1579cb3aa7ab94baed1a6319ba946d4a64cba9e3bf52b05
-EBUILD qtspeech-5.15.2-r1.ebuild 714 BLAKE2B 3dab8c2615c3d412fe02525b2db6831efbc544740c142a487caa09b161c7ae7f33229d325b2806c9bf8d57bec98dc3a6d49971c52cb0f5c24126d584d7e52a3d SHA512 16a689b9ee743e826f518ccd69ea6bc2adbbeac764fe247fe00808e733a78e804c0dcbea1109ca208fbddcfcccaee41a09acab1032738d1acfd228fddfae58bd
+DIST qtspeech-5.15.2-16c62552.tar.gz 93297 BLAKE2B 3d880469fc83e0923bcc7bb7709273adbcd1d0a5cbc59c32560fe0256d8c4f7ca00593ec400c038b79f1f1ce42236f465d3df9ac643c394791a7ac4cd0d8a98f SHA512 201b516cde7b12cb7313e222cc893a1a7be0751ed54ab84e86f23fee36b11653c1cc79aeeb6a5fa4172deb388ae93fc9da39d5ccb65028ef14d36477f0e4e9ab
+EBUILD qtspeech-5.15.2-r2.ebuild 770 BLAKE2B a8c2546b7a6ba35931c40659a353a6c2fe4def7d0c2d593f2c289fc9172a7a07b80824e3b53c161e533cf41390f0698a30074c9029396c07d8519099e29c8905 SHA512 3b5955230690748bc04aa3f5a1a5a872695e31d33a4f06c6530481e36b0e5199baba31e44eaa042ae6d0c2efb6bfa518acd9b3df906a4ab4ed28787f24207dfd
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2-r2.ebuild
index 996d482b76cc..7e18ff7c96f3 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.2-r1.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.2-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+KDE_ORG_COMMIT=16c625528f5e34e698983fc66a7c9cfb96da8052
 inherit qt5-build
 
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index be1b27c76da1..bef67e240bc2 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,3 +1,3 @@
-DIST qtvirtualkeyboard-5.15.2-353b75b2.tar.gz 13693438 BLAKE2B fc803496c2b56967e6b5d192805fa577072561cc55a891957e47985cec6d4971aa055e2d9d9b2e585d182426ec835f604279f7bf9882fd50ead9c65d29f91e5b SHA512 0152ad3848dd856ca4d3551e4296a68ed3bc7cd8d8dd45655232ca64586c1ce936ee819dff0dc3e2f6779a70f1faf5ae3d3fd2183a69f9313d943c506391b167
-EBUILD qtvirtualkeyboard-5.15.2-r11.ebuild 1277 BLAKE2B b07b01567cc68de87595489556fd2ab46a37ecf9f9c7235f742d40c7124bab595dabfe1b981bd165b04bdfabbcc0e6af6f2f7037ea59f7ecfa99fcaa9858ac7b SHA512 dd1787e5a12752a83be8822baa9c5072292f1d51b723ec21201d183e429f3c28c04bc6bd2d186565a5c78a18e0e4e41f453816c492fb2b89514ec1200b86c38f
+DIST qtvirtualkeyboard-5.15.2-98d1fd86.tar.gz 13693307 BLAKE2B f91f01fc70ecb2f50052caa5e174f179076781bbcbc38af05816e12a10f51facab16b6f8350d84ae65f25610cf75afcbf601210db210d0eb864b54f6b6aa9635 SHA512 3ea4b945a4e6fdcc288c0cfbc2bd57637f1c32e81271eaaa6d4e287f4ffded10dd41367e937d83d4effcc7a7e8ec8d4842d3891c48cccfbd3235fcc6628883a7
+EBUILD qtvirtualkeyboard-5.15.2-r12.ebuild 1277 BLAKE2B c1cc48e49b8d61d4c4664c38a239a5f027f4229d90e230afb886bfbd94095c7fd63161c42207dd26820fa9f8af9228828429c5ef8b5e030b3bc8ab6a6dc84962 SHA512 f17daacea478180f8a7d72896602f2183cd2e46e0d82de2b0937ef555a2009e7bf1c5eb7e9950ec456e64f57d448b7d352435c8134eae0d178a856e9734929c6
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r12.ebuild
index 0ed8265c7dda..95fba6ff3019 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r11.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-KDE_ORG_COMMIT=353b75b2e34bdae901625bbddf5c5e3f3e6c0de5
+KDE_ORG_COMMIT=98d1fd864cbb6c7c012c4139118808af110fb8f0
 inherit qt5-build
 
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 2f0e2c6dad16..0fa60d9feb43 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,9 @@
-DIST qtwayland-5.15.2-4644d51f.tar.gz 831697 BLAKE2B c3d60416ef71030018918ec5157122e2585d270d5aa1a74d66874a33f14f0c4ac85da5a1dd7bfb422a1090f79e5d2c08763c68fe724416b34bad16f945d1740c SHA512 e350396e9bdfa6f0fda938af74c722792d50473eb3d786442ba11919e7801f0cd8d045916c8e49d8a63ffd966376cb74e7cc1c3d4d1732e71061fb8343a497d3
+AUX qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch 4691 BLAKE2B d817e7715759dfd6a6efc13b3b8e7742406b3af7cdf8602e134121b8d6e97e857dc82bb71e32c0ad04a04fc8f20443475bd5a251ab6eb0c83412a75201865561 SHA512 82ac704e0a57a0e6272676c329e29116a7ab4186c94a1e81fe4f503bf332b20b699930d86ff22e9a83e72be856a5711230f264a6d10991fd070601ab4e4fd67c
+AUX qtwayland-5.15.2-fix-qmake-deps.patch 4129 BLAKE2B 7e74b67de4a73a7fe0ff8027d897f8e01ecb1fc8d198060d39e3958feea5c6256ccd837ebedf71e4862807e7183069af009d1af36c27240decc79f078ae793aa SHA512 132791eb8837bb760bbfcb459b81306351c5d3d978d347d79d9eefe44f2878c88a0b2e287f30bcf04e3a4d98c47803763fcd618b1535254a8fcb1c1e6e123494
+AUX qtwayland-5.15.2-fixup-mutexes.patch 3164 BLAKE2B 59859577c9e28932e66283eb65c2923929afa284d8c7e31e5fbe0f27a01176873352fb5bcbfffc5d4da875310c3faa4ecfb1148fa9a19bd31c40d1b8af864efd SHA512 fa022a4d04f3fd8cdc7ec5d8763263ae724ca0a5e978bee54ac8a2a91a816b02a5c89bb3f92d80d5b4f4487f602bd02e8fe196cf97c79a05aa9ac6cf2aab89e5
+AUX qtwayland-5.15.2-guard-mResizeDirty.patch 1340 BLAKE2B 2ba77b36531a88f7dccf99fbdbd20adfa9085accd074a6b205a09743fac1e41b7410191101d7e2eef51458e821e4e37cf9bfcad849d31c948bef29b6f8f1ee88 SHA512 0a38e1aad784c66e723c6cd351ed6414c9cb53f89c106097f5594e24b7d22a8cdc96180fc138948dd0d40444ef16544f3ca3ce0b52acdda5cd7839954f244980
 DIST qtwayland-5.15.2-867540b9.tar.gz 830061 BLAKE2B b831288d6a3e671631b4df00eb1edb72e35128f3ed5a73983b3e15193f554fddcd0337deb832d44b795d2e37f0601fe35b8b0fcb5986bcc44154d172f3a54193 SHA512 b834802811d9f65559ef5e7468189b53c666e390aa09edeb490e5fee2dece13082b11da0f8b5924b89f7dc8e1eba375a485940f4dfbf0445f3d1e96033e33f24
+DIST qtwayland-5.15.2-d6a6b727.tar.gz 831439 BLAKE2B 430f7c8570f9941e80db68f63efa9669f40d045e8df8820ec8653152938078b91d8d68b76667c6c01cc83cfca3f3b0ea67b6fdee6230e04fd091dcaaed4400bc SHA512 a2314f31c979594c4bd46fe8f1ac44d3391e45e6fedef44eaac5fb8700d1b32ac992f3e9d17e2453f0311038979a2bf8fabb14ea887525e16fb210307844c71d
 EBUILD qtwayland-5.15.2-r17.ebuild 954 BLAKE2B d76d0fada2321e8e74e00f678470963f1070fee8c93ca59b6e5255961ce726a49bd8c2a6baae87cc2a6b67a1d6ecfcaa2532966313b4b096afb807d7a5c27786 SHA512 068cef3071a0ec4ab569201cff69189b234fec2149e3be5b397dbe0219bcc2fa2360c3a7fca4763f5f48abf4f7c89b2b5142559bee44ae46490749dacc785fbb
-EBUILD qtwayland-5.15.2-r18.ebuild 960 BLAKE2B 0cc835e01b4e027087ecd66576bfcf2444f1f0223d8442383017ccec93e4d71e31d338f76644017a7d118334376951acd732e35270d0178585e54428884da225 SHA512 9d54e61984b400d9d91d9efd39baed29c2ccc16d1dbaf45c2d254acd552d95f633471f447e21e167e86cf7ecdbfce847ed55b31920107ad727193600deb8a3cf
+EBUILD qtwayland-5.15.2-r20.ebuild 1149 BLAKE2B 8a6422405942a4127dc1ccc88fdf5c05bba8f53fc1ff29b62920590ab1d30b940c0a6ffb334d6305376119320c188700ef5321d2d66535b6765eebf061cfd352 SHA512 c9e953dd0b71b52e8841a9f9e69f0f65699e279ccbd5f45b431ff20b69b3a637020f2e8fd0061818df68b1134bead931d4b1f776e71a2041573f435d3792fc1c
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch
new file mode 100644
index 000000000000..8bffa3e08b3e
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch
@@ -0,0 +1,131 @@
+From d7b34dbf072236cdfb3b64e5ad26d1ff29dfec5f Mon Sep 17 00:00:00 2001
+From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
+Date: Thu, 22 Apr 2021 08:42:33 +0200
+Subject: client: Gracefully handle shutdown and window hiding
+
+When a window is hidden or destroyed, the render thread may already
+be rendering. We need to properly read-lock the surface pointer
+when it is in use and exit when it becomes null.
+
+Note that there is also a potential crash in the Mesa GL driver
+where it keeps a proxy to the wl_surface, so if we delete this
+while we are still rendering, it can crash inside the driver.
+This is not addressed by this patch, and has not been reproduced
+on any other drivers so far.
+
+[ChangeLog][Client] Fixed a crash that could happen when hiding
+or closing windows while Qt Quick was actively rendering on
+a different thread.
+
+Pick-to: 6.0 6.1 5.15
+Fixes: QTBUG-91264
+Fixes: QTBUG-90037
+Task-number: QTBUG-92249
+Change-Id: I029b123b83c58740321e8b90a463ced748d8bcf4
+Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+(cherry picked from commit b19b0fbaf775e8b8eda1e03c265a5393d618c6c0)
+---
+ src/client/qwaylandwindow.cpp                   | 17 ++++++++++++++++-
+ src/client/qwaylandwindow_p.h                   |  2 +-
+ .../client/wayland-egl/qwaylandglcontext.cpp    |  1 -
+ 3 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 494911b3..0d849b57 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -414,6 +414,7 @@ void QWaylandWindow::closePopups(QWaylandWindow *parent)
+ 
+ QPlatformScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
+ {
++    QReadLocker lock(&mSurfaceLock);
+     if (mSurface) {
+         if (auto *screen = mSurface->oldestEnteredScreen())
+             return screen;
+@@ -552,6 +553,10 @@ void QWaylandWindow::sendRecursiveExposeEvent()
+ 
+ void QWaylandWindow::attach(QWaylandBuffer *buffer, int x, int y)
+ {
++    QReadLocker locker(&mSurfaceLock);
++    if (mSurface == nullptr)
++        return;
++
+     if (buffer) {
+         Q_ASSERT(!buffer->committed());
+         handleUpdate();
+@@ -571,6 +576,10 @@ void QWaylandWindow::attachOffset(QWaylandBuffer *buffer)
+ 
+ void QWaylandWindow::damage(const QRect &rect)
+ {
++    QReadLocker locker(&mSurfaceLock);
++    if (mSurface == nullptr)
++        return;
++
+     const int s = scale();
+     if (mDisplay->compositorVersion() >= 4)
+         mSurface->damage_buffer(s * rect.x(), s * rect.y(), s * rect.width(), s * rect.height());
+@@ -605,6 +614,8 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
+         qCDebug(lcWaylandBackingstore) << "Buffer already committed, ignoring.";
+         return;
+     }
++
++    QReadLocker locker(&mSurfaceLock);
+     if (!mSurface)
+         return;
+ 
+@@ -624,7 +635,9 @@ void QWaylandWindow::commit(QWaylandBuffer *buffer, const QRegion &damage)
+ 
+ void QWaylandWindow::commit()
+ {
+-    mSurface->commit();
++    QReadLocker locker(&mSurfaceLock);
++    if (mSurface != nullptr)
++        mSurface->commit();
+ }
+ 
+ const wl_callback_listener QWaylandWindow::callbackListener = {
+@@ -725,6 +738,7 @@ QPointF QWaylandWindow::mapFromWlSurface(const QPointF &surfacePosition) const
+ 
+ wl_surface *QWaylandWindow::wlSurface()
+ {
++    QReadLocker locker(&mSurfaceLock);
+     return mSurface ? mSurface->object() : nullptr;
+ }
+ 
+@@ -749,6 +763,7 @@ QWaylandScreen *QWaylandWindow::waylandScreen() const
+ 
+ void QWaylandWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation)
+ {
++    QReadLocker locker(&mSurfaceLock);
+     if (mDisplay->compositorVersion() < 2)
+         return;
+ 
+diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
+index d45980a8..54ac67a9 100644
+--- a/src/client/qwaylandwindow_p.h
++++ b/src/client/qwaylandwindow_p.h
+@@ -288,7 +288,7 @@ private:
+ 
+     static QWaylandWindow *mMouseGrab;
+ 
+-    QReadWriteLock mSurfaceLock;
++    mutable QReadWriteLock mSurfaceLock;
+ 
+     friend class QWaylandSubSurface;
+ };
+diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+index 683fe123..8f12736d 100644
+--- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
++++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.cpp
+@@ -192,7 +192,6 @@ public:
+     }
+     void blit(QWaylandEglWindow *window)
+     {
+-        Q_ASSERT(window->wlSurface());
+         QOpenGLTextureCache *cache = QOpenGLTextureCache::cacheForContext(m_context->context());
+ 
+         QSize surfaceSize = window->surfaceSize();
+-- 
+2.35.0
+
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch
new file mode 100644
index 000000000000..e0c18228ed0f
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch
@@ -0,0 +1,126 @@
+From 3b72261b8b06397a532a40e41103c6b7a44e3ab5 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Fri, 4 Feb 2022 11:07:36 +0100
+Subject: [PATCH] Use proper dependencies in compile tests
+
+Use the dependencies as found by the "libraries" section instead of relying
+on them being available in the default location (e.g. "-ldrm").
+
+Additionally, VK_USE_PLATFORM_WAYLAND_KHR requires <wayland-client.h>, so
+add the wayland-client dependency.
+
+This fixes those tests if e.g. wayland-client headers need to be found through
+pkgconfig.
+
+This part of the code changed completely in Qt 6, so this is a totally
+different patch and not a cherry-pick of 5fc2e1915c3a
+("CMake: Fix qtwayland feature detection").
+
+Fixes: QTBUG-100475
+---
+ src/client/configure.json     |  8 ++++----
+ src/compositor/configure.json | 34 +++++++++++++++++++++++++++++-----
+ 2 files changed, 33 insertions(+), 9 deletions(-)
+
+diff --git a/src/client/configure.json b/src/client/configure.json
+index 2f424580..29222357 100644
+--- a/src/client/configure.json
++++ b/src/client/configure.json
+@@ -149,8 +149,7 @@
+                     "#endif"
+                 ]
+             },
+-            "libs": "-ldrm",
+-            "use": "egl"
++            "use": "drm egl"
+         },
+         "vulkan-server-buffer": {
+             "label": "Vulkan Buffer Sharing",
+@@ -168,7 +167,8 @@
+                     "exportAllocInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
+                     "return 0;"
+                 ]
+-            }
++            },
++            "use": "wayland-client"
+         },
+         "egl_1_5-wayland": {
+             "label": "EGL 1.5 with Wayland Platform",
+@@ -183,7 +183,7 @@
+                     "eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, (struct wl_display *)(nullptr), nullptr);"
+                 ]
+             },
+-            "use": "egl"
++            "use": "egl wayland-client"
+         }
+     },
+ 
+diff --git a/src/compositor/configure.json b/src/compositor/configure.json
+index bcfd5215..da95d07b 100644
+--- a/src/compositor/configure.json
++++ b/src/compositor/configure.json
+@@ -7,6 +7,31 @@
+     "testDir": "../../config.tests",
+ 
+     "libraries": {
++        "wayland-client": {
++            "label": "Wayland client library",
++            "headers": "wayland-version.h",
++            "test": {
++                "main": [
++                    "#if WAYLAND_VERSION_MAJOR < 1",
++                    "# error Wayland 1.8.0 or higher required",
++                    "#endif",
++                    "#if WAYLAND_VERSION_MAJOR == 1",
++                    "# if WAYLAND_VERSION_MINOR < 8",
++                    "#  error Wayland 1.8.0 or higher required",
++                    "# endif",
++                    "# if WAYLAND_VERSION_MINOR == 8",
++                    "#  if WAYLAND_VERSION_MICRO < 0",
++                    "#   error Wayland 1.8.0 or higher required",
++                    "#  endif",
++                    "# endif",
++                    "#endif"
++                 ]
++            },
++            "sources": [
++                { "type": "pkgConfig", "args": "wayland-client" },
++                "-lwayland-client"
++            ]
++        },
+         "wayland-server": {
+             "label": "wayland-server",
+             "headers": "wayland-version.h",
+@@ -151,8 +176,7 @@
+                     "#endif"
+                 ]
+             },
+-            "libs": "-ldrm",
+-            "use": "egl"
++            "use": "drm egl"
+         },
+         "dmabuf-client-buffer": {
+             "label": "Linux Client dma-buf Buffer Sharing",
+@@ -176,8 +200,7 @@
+                     "return 0;"
+                 ]
+             },
+-            "libs": "-ldrm",
+-            "use": "egl"
++            "use": "drm egl"
+         },
+         "vulkan-server-buffer": {
+             "label": "Vulkan Buffer Sharing",
+@@ -195,7 +218,8 @@
+                     "exportAllocInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
+                     "return 0;"
+                 ]
+-            }
++            },
++            "use": "wayland-client"
+         }
+     },
+ 
+-- 
+GitLab
+
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch
new file mode 100644
index 000000000000..b861cebe60ac
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch
@@ -0,0 +1,87 @@
+From bf4335b1ea9b179076cbd7a1c2e8cfa9538b1dc1 Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Thu, 3 Feb 2022 14:27:08 +0000
+Subject: [PATCH] Fix up mutexes for frame callbacks
+
+Everything related to frame callback timings is used by potentially 3
+threads. Access needs guarding.
+
+Change-Id: I9f22390c175d9f2f63d31b1ebf0cdc0b830be937
+---
+ src/client/qwaylandwindow.cpp | 14 +++++++++-----
+ src/client/qwaylandwindow_p.h | 10 +++++++---
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 7aee362a..72e0e601 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -256,8 +256,12 @@ void QWaylandWindow::reset()
+         mFrameCallback = nullptr;
+     }
+ 
+-    mFrameCallbackElapsedTimer.invalidate();
+-    mWaitingForFrameCallback = false;
++    {
++        QMutexLocker locker(&mFrameSyncMutex);
++        mFrameCallbackElapsedTimer.invalidate();
++        mWaitingForFrameCallback = false;
++    }
++
+     mFrameCallbackTimedOut = false;
+ 
+     mMask = QRegion();
+@@ -1142,6 +1146,7 @@ QVariant QWaylandWindow::property(const QString &name, const QVariant &defaultVa
+ 
+ void QWaylandWindow::timerEvent(QTimerEvent *event)
+ {
++    QMutexLocker locker(&mFrameSyncMutex);
+     if (event->timerId() != mFrameCallbackCheckIntervalTimerId)
+         return;
+ 
+@@ -1200,15 +1205,14 @@ void QWaylandWindow::handleUpdate()
+ {
+     qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread();
+ 
+-    if (mWaitingForFrameCallback)
+-        return;
+-
+     // TODO: Should sync subsurfaces avoid requesting frame callbacks?
+     QReadLocker lock(&mSurfaceLock);
+     if (!mSurface)
+         return;
+ 
+     QMutexLocker locker(&mFrameSyncMutex);
++    if (mWaitingForFrameCallback)
++        return;
+ 
+     struct ::wl_surface *wrappedSurface = reinterpret_cast<struct ::wl_surface *>(wl_proxy_create_wrapper(mSurface->object()));
+     wl_proxy_set_queue(reinterpret_cast<wl_proxy *>(wrappedSurface), mDisplay->frameEventQueue());
+diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
+index 3ff68ccb..025d7917 100644
+--- a/src/client/qwaylandwindow_p.h
++++ b/src/client/qwaylandwindow_p.h
+@@ -226,13 +226,17 @@ protected:
+     Qt::MouseButtons mMousePressedInContentArea = Qt::NoButton;
+ 
+     WId mWindowId;
++
++    // The following are used by the main thread the render thread and the event frame thread
++    // Access should be guarded by mFrameSyncMutex
++    QMutex mFrameSyncMutex;
++    QWaitCondition mFrameSyncWait;
+     bool mWaitingForFrameCallback = false;
+-    bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
+     int mFrameCallbackCheckIntervalTimerId = -1;
+     QElapsedTimer mFrameCallbackElapsedTimer;
++
++    bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
+     struct ::wl_callback *mFrameCallback = nullptr;
+-    QMutex mFrameSyncMutex;
+-    QWaitCondition mFrameSyncWait;
+ 
+     // True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer
+     bool mWaitingForUpdate = false;
+-- 
+GitLab
+
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch
new file mode 100644
index 000000000000..c2e377cff054
--- /dev/null
+++ b/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch
@@ -0,0 +1,37 @@
+From 2e2042aa18efd1389a140a5d0028d8359bd455a7 Mon Sep 17 00:00:00 2001
+From: David Edmundson <davidedmundson@kde.org>
+Date: Thu, 3 Feb 2022 19:42:33 +0000
+Subject: [PATCH] Guard mResizeDirty by the correctMutex
+
+mResizeDirty is used in the GUI thread in setCanResize which can be
+called from the GUI thread. It is queried and set whilst the resizeLock
+is held. We need to guard our usage.
+
+Change-Id: I5f8dcf8aa2cb2c4bb6274103df1da9e3e268605a
+---
+ src/client/qwaylandwindow.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 949374b1..7aee362a 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -357,11 +357,12 @@ void QWaylandWindow::setGeometry(const QRect &rect)
+         if (mWindowDecoration)
+             mWindowDecoration->update();
+ 
+-        if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize)
++        if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize) {
++            QMutexLocker lock(&mResizeLock);
+             mResizeDirty = true;
+-        else
++        } else {
+             QWindowSystemInterface::handleGeometryChange(window(), geometry());
+-
++        }
+         mSentInitialResize = true;
+     }
+     QRect exposeGeometry(QPoint(), geometry().size());
+-- 
+GitLab
+
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r18.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild
index 48fffae55af5..715878b3b4d9 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r18.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=4644d51f4b52e83fc1b4d02b380d80d9d57e76fa
+KDE_ORG_COMMIT=d6a6b727832819d118199f7016c2c401663ee370
 inherit qt5-build
 
 DESCRIPTION="Wayland platform plugin for Qt"
@@ -33,6 +33,13 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-QTBUG-90037-QTBUG-91264.patch"
+	"${FILESDIR}/${P}-fix-qmake-deps.patch"
+	"${FILESDIR}/${P}-guard-mResizeDirty.patch"
+	"${FILESDIR}/${P}-fixup-mutexes.patch"
+)
+
 src_configure() {
 	local myqmakeargs=(
 		--