gentoo resync : 02.02.2022

36 files changed, 75 insertions, 701 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 7439997369a7..a6fe2100be3a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 2256f2accea6..1b8333c9ee1e 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,6 +1,3 @@
-AUX qtbluetooth-5.15.2-gcc11.patch 596 BLAKE2B 0b8b8e493ff32e34a53e1fd22358f556bb7844fea8eeb3e8384f82aeb1ca63c760d234c2f4cfdf25ae5bfb9a7b86c7c95c8bc421d1f812ec84f87a904c300e74 SHA512 f598c403fadb7c88e972f2c4dd91f0c6ebd85a7c1812c632a3aa9826780d26dcecdbe0f2f7e8c4ed0e412b6ef4cee4aeb194cf393e418418686233fda9fe41bc
 DIST qtconnectivity-5.15.2-5e9ca5d3.tar.gz 3412877 BLAKE2B 07d201a934b72aab5ec90bbe667578d7150a3e93379278a44ff63ff67568bc6dfeff075d763e544e209dd0b6d9f53ca8214f483a3ff38794252b39c8ad5e80f5 SHA512 6be16baa0f63d6b36836adac50df4b9db79ca65b3bb4c92be13f748cec9384c42e57833bc1d06a8f50575f13623965cf40d1497e5fa51f44cb51b15760fb198f
-DIST qtconnectivity-everywhere-src-5.15.2.tar.xz 2815492 BLAKE2B 0702601266d46669e0a39740b6df539b1d3f6dcb62d06b14f5ba89782e9bd38faa391892841434feccd9599eef09c7c7238efb82e11a0633e73f58dd721d3324 SHA512 a934dcdd28645ba23dd429215643694d9a14449a4c3e1a6154a9a19cb3210f3d80978b46aefff2b110db533fa1816450f2f73a27d80df5330a92799e4cca1b9c
-EBUILD qtbluetooth-5.15.2-r1.ebuild 734 BLAKE2B ba2d32b3c80171665c2ee6b578884a08e6c79908740becc9e336e2948c1e345d8b1ccc541cb02eaf781b4e47c50deebd2c70d6a2729cf97b07c0a983b3fabd28 SHA512 23c55f55b436fc4b4e633934aa0f40f1aac743a832504e4b12212d5c33a529bcfa868f845188932fee8c37d82d844dd722179ca3f833d1c0eef423a6c24f0f71
-EBUILD qtbluetooth-5.15.2-r10.ebuild 737 BLAKE2B f16d85fae8e8e7d9aa79202a71906f81018ec42513d49a0b56e00e44fcf9ca7de95ecebc6b304ad42d4010aa1acde698632cd6fc44463da251db3abd31849e79 SHA512 08329e4bfbd4ffdfc28ce61123347411b4b96fbde515dc070fbd56712b0f5d0c14d7404e4b0820007438b4db44bd5cf9d84d33ff47433939fab2e62e8e1c4a76
+EBUILD qtbluetooth-5.15.2-r10.ebuild 733 BLAKE2B 49ec79aac68cb016e98bb639fa31b5cddcd6f906038df4593742f84fa56e5cb54351c00fb76ae60b5d9cd9db8c29e61270e3d197e06ab44c99ddaf934828b6a5 SHA512 ef023d5ba8ca9faabd904703a44e550de2b7cd8c04a986241011ca8c7a757809677d7a0a0022bfd2af0c256d6bb04aa63a59567fd17ef260c6e68fc1d1fb0d80
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch b/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch
deleted file mode 100644
index 7c27730574b6..000000000000
--- a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0ae88b90f857bfcc2d0ea33d16753d8eed5db9e1 Mon Sep 17 00:00:00 2001
-From: Jeff Law <law@redhat.com>
-Date: Oct 16 2020 20:08:46 +0000
-Subject: Add missing #include for gcc-11
-
-
-diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp
-index b150466..507603c 100644
---- a/src/bluetooth/lecmaccalculator.cpp
-+++ b/src/bluetooth/lecmaccalculator.cpp
-@@ -38,6 +38,8 @@
- ****************************************************************************/
- #include "lecmaccalculator_p.h"
- 
-+#include <limits>
-+
- #include "bluez/bluez_data_p.h"
- 
- #include <QtCore/qbytearray.h>
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
deleted file mode 100644
index 1a88564f814e..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdbus-${QT5_PV}*
-	>=net-wireless/bluez-5:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-DEPEND="${RDEPEND}
-	=dev-qt/qtnetwork-${QT5_PV}*
-"
-
-PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild
index 5d96509f047b..e8a25918c451 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.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
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 40ba83b707b7..936f9c2ebeba 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,10 +1,6 @@
 AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
 AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
 AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
-DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
-DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
 DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
-EBUILD qtcore-5.15.2-r11.ebuild 2325 BLAKE2B 8cbabcd9be308995f05c847446e11376bada59ef7f937fad98b906b83b1f50417fbd7cd612903c129eaa66db1fb8d835d157cc4e506c5b430ef291d710e15c26 SHA512 66e9558247d8c71bfd6d784ad4fa9e46639a50a1d073ae438062891de769cee24081b797f8c8b5d0ca915090acb1d2a52177105eed2a637702ea18761bd4c3f4
-EBUILD qtcore-5.15.2-r13.ebuild 2331 BLAKE2B 387048a47070b5c741421931677a981c0f972417128f37a828a7e5ebad19542875199caad87d9587ee58c7b1ab546aa22c5259125c3592064518292b10becbac SHA512 23739928c09ee359908ec1297ad7844dc653925d2e9b978da22aedab95e41a17940b4b858445e0865550e48e86176f6552862c333818cfa9ad349fc17652d178
-EBUILD qtcore-5.15.2-r14.ebuild 2331 BLAKE2B 03110db1e78f93a0a996ff478559fc2553df761af5badc924378a18a7464f35f09153f37e1923b377cd014a25486193e074ae418218419bdba86bf323bbdf0a4 SHA512 0fde78d3b88edda574734fb98217af5de5977f0803d8f78b103468497af99dff1e6c91490aa2c0550969ee67a8ecdd59f443fdb34c903eefa18c2963d55ea395
+EBUILD qtcore-5.15.2-r14.ebuild 2325 BLAKE2B afb40aecf1e4889e4ddb266b6798c926d5485989248f4af3565759956c93a77aad0209a015ccacb5368b0085292029c641720235ea2276849f123d698a933677 SHA512 daba0cc3491ae99ac71aab82f56666dca233c69005d600a69fb4f59b82a7c561dc84fcd8d8ebcaa96bb808488d59343abc7f3b259bb4aecbc86334032e95575a
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
deleted file mode 100644
index 4fa3eccb6511..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtchooser-66-r1
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
-	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
deleted file mode 100644
index 0b8f86d5973a..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.2-r13.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtchooser-66-r1
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
-	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
index 363ceb67039c..3ad237c5094d 100644
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 97761ec22b08..b4737c50373b 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,5 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
-DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-EBUILD qtgui-5.15.2-r15.ebuild 4047 BLAKE2B 94f623f9000cb7f047603a8fbbe87f58e2032a304a74928f7dbe57f199d702c02652207561a1f9ea02c75d7d464a0225daea49c991a6546eac3f8b18e50c8e86 SHA512 3a5942c08b470da4b410cbdc12b12ded5ec1404b57fc7db279232549221cc10b090fe0604b48d36e3bd6324a53d27a8179bcbf60908d65fe6965561573b448c6
-EBUILD qtgui-5.15.2-r16.ebuild 4053 BLAKE2B a3e8aa388a3092995c8f4e9a2780093a97540453d9d5e4c7501f62ec450affd1db48d12fa02e1e9903c63b46a05c122403128bc76a304b2e074235e3328ba2b8 SHA512 beb06ca164998fab4b28edaa23233a87a3ed93d616f40331ea29c0897aed161dd3e3e8ea7793508e4145c3f2082b96b3f4043abb0c92c6319bbf9bf8fdf58053
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
+EBUILD qtgui-5.15.2-r16.ebuild 4047 BLAKE2B 4fbf8abbb392c816e4fb2b1976d6e059dbbb2ba26c286d182a9fa60590a725d134de0d5faea7e879f25d6b4d462b7f92baa93f2dc9ffbfffa2f4184d619e475f SHA512 6a09a82ef042bda13469edffa3390d77de233ba90d82518448db794a47fa25150d6d948dfc56f9f25065ff3782aaf282218bb84546ce9aa21ab0e7d45d1fe22e
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
deleted file mode 100644
index 5b9c23c319a7..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.2-r15.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs linuxfb vnc X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	sys-libs/zlib:=
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	eglfs? (
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	jpeg? ( virtual/jpeg )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	udev? ( virtual/libudev:= )
-	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb:=[xkb]
-		x11-libs/libxkbcommon[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	linuxfb? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usev dbus -dbus-linked)
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usev eglfs '-gbm -kms')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usev !gif -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use linuxfb)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
index 3d8b468b1913..6292f2e6d98c 100644
--- a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
 QT5_MODULE="qtbase"
 inherit qt5-build
 
@@ -11,7 +11,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index c628e50cbd1f..4b845139b999 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-5.15.2-38ad2f39.tar.gz 67969272 BLAKE2B 9071c96e8162d8141676f63aab82ca61ba29039e79066939fb74501187ae95cca34c924f1105827411f021efca2f40a62b7acde845d0d463604b234a3a8f8370 SHA512 df4f2dce732f62c797f77c266e268097f32a5d7605b3464c9a76d323d8ec069c902994df6afa28823d3c03f5d4ca0295cac47e28773b25e2f9387e3475f52f82
-DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
 DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 EBUILD qtnetwork-5.15.2-r11.ebuild 1661 BLAKE2B 72d1089771b6546c2425872e547420e7c4326af64b21f92b7008633fa36e7cbd0f064a339f486ad7ebcfefac76e136242273b9b902aacac92cd2fc1933a1af15 SHA512 e08756281594e069079dcb3fa2688c93a42a30f3efec0f7cfa1662edfc2bd5b444db75be2f47ac341192d44fef3610692eb76f2cbe048c2a2cb48756c52daa25
-EBUILD qtnetwork-5.15.2-r13.ebuild 1640 BLAKE2B 6bda08ead6e9a2a4db7c11934f414ca44fcf590f1dbaea4100f52d6ca1b4778cf0df392e03d15f3c23248dd5087a14b210f32ea4488a0372a0739c1f2917d972 SHA512 d7f1a7456a9259859d4177b90e1da469c55ef637f1ef51c89b6083b683c28092fc333ba6d6cd38a426a93fe1cea12f72a34d6bb555da83c8ac03c0e0e47eef36
-EBUILD qtnetwork-5.15.2-r14.ebuild 1646 BLAKE2B 0a7829d6604d07a63639bd78967759057014d590d5ce9d5d10e4db3fc7fa975bc17b85953833364e7d4507f3d96d67362d97639eb8d539862742bb3933a2c166 SHA512 bd6b77fee78a61ed9e0b25f7c8634e4d641e264d803f945dd1f9fac400f0a6b2b43130424b720f29399afcf752c0625827f7a42c2af99487646cc97e08feedd0
+EBUILD qtnetwork-5.15.2-r14.ebuild 1640 BLAKE2B 753822b63518b515e42437ffecc166b27e17c1218fea09bc98ec3f81d21bae155bb07bfebe88e5e53a2e9cddcf5d1591f0b9dd2db2d623d31a70706b7df037ef SHA512 8f8f428dd8532ea1dca9f4c35d371e3cd62952e2da66f57485c829eb08fe259e9f4ccb3d652c4bfc90249febd49a4117d68d92b51223264154160ffc9e4335da
 MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild
deleted file mode 100644
index 575e3e914b94..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r13.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-libs/zlib:=
-	connman? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	ssl? ( >=dev-libs/openssl-1.1.1:0= )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(usev connman -dbus-linked)
-		$(qt_use gssapi feature-gssapi)
-		$(qt_use libproxy)
-		$(usev networkmanager -dbus-linked)
-		$(qt_use sctp)
-		$(usev ssl -openssl-linked)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# workaround for bug 652650
-	if use ssl; then
-		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
-			-i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
-	fi
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild
index 466b55f77a43..b74124fe8839 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-KDE_ORG_COMMIT=38ad2f39daec09168728033969265834b6a2d924
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index f2ceae3163ed..61c9ffe7bbd4 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,3 +1,3 @@
-DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-EBUILD qtprintsupport-5.15.2-r11.ebuild 866 BLAKE2B 5e9b8c91433ce322f1a37e461cb7520e543ff1f857511eb5ca88caecc793d3dfe4f29a5f8a9335a291517b86e049e0e43f14413b31a5a8ecb1598a050b80b195 SHA512 d8d6f9791a7ea0c800baeaa7ba721792122209a1a20d422a79b3b6bc696fbf1113ce4f223bbadfc5f84b05b33a5941badeabecd0d62ed67039fe287ab286b168
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
+EBUILD qtprintsupport-5.15.2-r11.ebuild 866 BLAKE2B 51095c5e1ce74a10fe5673c755360402f440b40d34d197560415efb5bf602a1bc621cdd9e8288c57285ec1820cfe3dcdd567d47246326fa97ee3b5d16db96f17 SHA512 e6b693f825fb453f38a7638534919910dc8d1052a803b75decb45ed24239074bed562a94862fddf6a95c1215f3dbcd6487ba910ae6f61dc299ca83c3ec904a7d
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild
index e121579bf860..b84d29633c0c 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.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=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
 inherit qt5-build
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 93acee6204ab..83a43961116d 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,3 +1,5 @@
+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
 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
new file mode 100644
index 000000000000..effe14d8cd02
--- /dev/null
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r12.ebuild
@@ -0,0 +1,32 @@
+# 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/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 395fc14171e2..0c1dcf2cdb0d 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,3 +1,3 @@
-DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-EBUILD qtsql-5.15.2-r11.ebuild 1300 BLAKE2B e81525e25353115ee217f98e84b08a6fc2743a5694c26f3d85087c8a9681432957cbb13701179377b792c0a4d49e0756bde814f365c9b4d802f286c403961fc7 SHA512 8083c829967dc8a55e2a91f2240aa6772f63ed2a9bbd7e2455eaccad61288d48e6bd0374f715cc091f66cfd22bac0d12cb4534cfaf71a51f949b5ef5390c8e92
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
+EBUILD qtsql-5.15.2-r11.ebuild 1300 BLAKE2B 797226aefd798a686b1ab3f2f774a616fd1d7294d20a5c98b4f5e4ecc90d0bf2f9ad42d0c11012b952edb9270bf292165c98c0b095e5c08f0a6abd14005bd008 SHA512 f7f0f507e50e44fdca6be138a5f14b186ebed1e4f2f9ecee656246a21df1c2e56c0bde0fdf84fddcd5df6af9451eeb2b5cb4500539f6f823a223adb7eeb250c4
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
index c20f4081db7e..fa5f0ed70dfd 100644
--- a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.2-r11.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=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index ad10098169f1..205aea56b91c 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,3 @@
-DIST qtsvg-5.15.2-24128cdf.tar.gz 2779708 BLAKE2B 5e52a0b1c7b3e21ab58b2e6e091c8fc85d5432e247313f74bd8c4d8899cd2634e3242d5d328174d3702544d050504dd3870c1c075a2b7a87c268c371c95b0c76 SHA512 c0840608ff66b0f335f8e5d883a5f8c113de91608ea8b613743c4881a103ff1c9981337c29a0e272ca2bccd4077df9cd8fde320e09eec1e8f6a3eead5cb75198
 DIST qtsvg-5.15.2-728012f7.tar.gz 2779740 BLAKE2B 6db82739d576dbb2d5958e48ee917dce9ce10fdf7af8b561f0c71ef3a90b97935e89f443ed1a95c827d85d87ffbb53595c27057f75bdac11939ba2bc9ef47f36 SHA512 ccf16606ff0abc9dce1279d58bd85489d0b1205da953842e12e8a9dad895c53a4420e4bd1aeafca1291f6721e2cc5c1a1178ad1d329832d21cc165646e8448d5
-EBUILD qtsvg-5.15.2-r11.ebuild 535 BLAKE2B abf9b0983cf4b988af93bdbfcf2630675f04399dab050d31b2e0efa4075f529ea6583d58304aa53e80f4efbdd4df9b5e20b97bdb3cbffb9d23d30081bcc17e8f SHA512 00a809f635a1ff84881f780dcc5d4dfcba1d90320a886f4c3928fd3f12a6e26d493fc45c66caaa261153e980c812da58774c7a032d11c4fcaea225428e3be1d5
-EBUILD qtsvg-5.15.2-r13.ebuild 541 BLAKE2B d910718ea476cc2cee47b96b0ca7e836eed57910f89ddfbf5125b29af17e61dd2694d5e8f6740919ebc1f791820641cbd5148720a4f1c40fea31d9aa4980d69a SHA512 0753d70c0000961d34235e3c524a48f7b7651bb27e9d02f51c121cf75ff1f4f812ff48b4f37d18812f43d26d753982128e624a14e2f181515e988ed9391adffb
+EBUILD qtsvg-5.15.2-r13.ebuild 535 BLAKE2B 4f36841bf587020481ca66e7489f9c99d0cdec5c00ad60b2eda3029b72de956469046c8fe4d0195bff9a1399f6e690fd1ef6c6e8d5b6af3854ef5c1b8e8da01d SHA512 7b07d9c8a06b3ede0f15b403f27532129f9bb6a8d8a49c6a8720222b63dab05bc0094ae4f8c364afb67fd1a6a381e954e0bbf56e452173247cbb52362f1581b2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild
deleted file mode 100644
index 289b1f29f642..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=24128cdf8bef53eddf31a5709bbbc46293006b1c
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtxml-${QT5_PV}* )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild
index 9c6578062f69..4964620056e5 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 1f0959026812..2f0e2c6dad16 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,6 +1,5 @@
-AUX qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch 1471 BLAKE2B d1f46af1c39967a04f10f887dc02c055fff30e8e88349ec1a009090df8ce27899c8c08e1c9cbb4584fb0861e734f4e3ae74ad994f8d902de4bd2dcc6523ec765 SHA512 1c231dd3b86e75e92ae488a176ae8c0317b9e889dc2a21c239a97823ca4eb8deab6a0e6c4011050d8a01f5414b2c70e962de9b974a05ffe96e8dd44630fd9fea
+DIST qtwayland-5.15.2-4644d51f.tar.gz 831697 BLAKE2B c3d60416ef71030018918ec5157122e2585d270d5aa1a74d66874a33f14f0c4ac85da5a1dd7bfb422a1090f79e5d2c08763c68fe724416b34bad16f945d1740c SHA512 e350396e9bdfa6f0fda938af74c722792d50473eb3d786442ba11919e7801f0cd8d045916c8e49d8a63ffd966376cb74e7cc1c3d4d1732e71061fb8343a497d3
 DIST qtwayland-5.15.2-867540b9.tar.gz 830061 BLAKE2B b831288d6a3e671631b4df00eb1edb72e35128f3ed5a73983b3e15193f554fddcd0337deb832d44b795d2e37f0601fe35b8b0fcb5986bcc44154d172f3a54193 SHA512 b834802811d9f65559ef5e7468189b53c666e390aa09edeb490e5fee2dece13082b11da0f8b5924b89f7dc8e1eba375a485940f4dfbf0445f3d1e96033e33f24
-DIST qtwayland-5.15.2-eb422ab5.tar.gz 829140 BLAKE2B e913e481741b23873a88db32896c7f3445a2ddee2dc9cfdf8e132fdd79021de369506e32ce9ed50977fb1c42d624169b7d67c9247f7609276e699e5ab3a9462e SHA512 b5094b00feab5909b4de6382a3633fc321d5f5fbc34e4cbde1f364123b24990df95cef5c34a90f73dca67b0578e0da71b894f771ebbd8d152dcdc71b114d9773
-EBUILD qtwayland-5.15.2-r16.ebuild 1051 BLAKE2B c55f2cecbb7b982b335c4faab58b08de69c52f72516da981c72dae5f6dbe8c7bb75623161b223670022fd323ff3ef9f7c4d85246a7940bb30b2835534cca2099 SHA512 a245da56e2acd5a90dd5c820f50e3676c90bb38a46de9caafe24138e031b796264944f0f0241bab744b6f33535a5b49d840d8bbc54109159cc59a8d1bfcebe8b
-EBUILD qtwayland-5.15.2-r17.ebuild 960 BLAKE2B 940c976529f89627d69e6d580539df17584d4696d933f503db9c0d0e99603a2e69cd695fe97a6cfa03de95290a563d1b17624b946088782ff24faed9cb676d80 SHA512 489ae7eb3b6754eb3f86e4fca9bd23ebb6f3ce8bbc3f9d1dd42c40bd81e1ffdb87ff69ddb42ceebaa3121816dfeda7b7976c47ffaa1823717cdfe3f9645e77fe
+EBUILD qtwayland-5.15.2-r17.ebuild 954 BLAKE2B d76d0fada2321e8e74e00f678470963f1070fee8c93ca59b6e5255961ce726a49bd8c2a6baae87cc2a6b67a1d6ecfcaa2532966313b4b096afb807d7a5c27786 SHA512 068cef3071a0ec4ab569201cff69189b234fec2149e3be5b397dbe0219bcc2fa2360c3a7fca4763f5f48abf4f7c89b2b5142559bee44ae46490749dacc785fbb
+EBUILD qtwayland-5.15.2-r18.ebuild 960 BLAKE2B 0cc835e01b4e027087ecd66576bfcf2444f1f0223d8442383017ccec93e4d71e31d338f76644017a7d118334376951acd732e35270d0178585e54428884da225 SHA512 9d54e61984b400d9d91d9efd39baed29c2ccc16d1dbaf45c2d254acd552d95f633471f447e21e167e86cf7ecdbfce847ed55b31920107ad727193600deb8a3cf
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch
deleted file mode 100644
index cf37737e0226..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-crash-when-iterating-through-outputs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 46ed85a80b28d519cf5887bbdce55d1bf57886c3 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Sun, 14 Nov 2021 13:54:19 +0000
-Subject: [PATCH] Client: Avoid processing of events when showing windows
-
-The only time we want to dispatch events from the wayland socket is when
-the application is waiting for external events. Doing so at any other
-time will cause unpredictable behavior in client code.
-
-This caused a crash downstream where we had outputs get altered whilst
-itterating through outputs, which shouldn't happen.
-
-There is no benefit to flushing here, it won't make anything appear
-faster as we haven't attached the buffer yet.
-
-Change-Id: Ie13eae4012dab96a93d8810f468d1343402b8c28
-Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-Reviewed-by: Aleix Pol Gonzalez <aleixpol@kde.org>
----
- src/client/qwaylandwindow.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 635c92a08..b0d1c0d1c 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -477,7 +477,6 @@ void QWaylandWindow::setVisible(bool visible)
-         if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
-             activePopups << this;
-         initWindow();
--        mDisplay->flushRequests();
- 
-         setGeometry(windowGeometry());
-         // Don't flush the events here, or else the newly visible window may start drawing, but since
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild
index 658532095a0c..f0296f5c97fa 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
 SLOT=5/${QT5_PV} # bug 815646
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r18.ebuild
index cb1a79288c53..48fffae55af5 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r16.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.2-r18.ebuild
@@ -1,18 +1,18 @@
-# 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=eb422ab5e07498a7a8d086f6a942ee35ab3c9776
+KDE_ORG_COMMIT=4644d51f4b52e83fc1b4d02b380d80d9d57e76fa
 inherit qt5-build
 
 DESCRIPTION="Wayland platform plugin for Qt"
-SLOT=5/${QT5_PV} # bug 815646
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
+SLOT=5/${QT5_PV} # bug 815646
 IUSE="vulkan X"
 
 DEPEND="
@@ -33,10 +33,6 @@ BDEPEND="
 	dev-util/wayland-scanner
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-crash-when-iterating-through-outputs.patch # KDE-bug 438839
-)
-
 src_configure() {
 	local myqmakeargs=(
 		--
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index f8bf3f2ce6bc..51796690bfb7 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,3 @@
 DIST qtwebchannel-5.15.2-fa8b0710.tar.gz 383826 BLAKE2B 3e9e9810735d5792340019a9a96cdbfeeb1259f4bd63e978c89bd3e40405c90e346ca126c9414bbe89e3c0541207fe5250ecf9a6358af8774dcda1e692e7e5b8 SHA512 b7ad0ad1b7749abf0079dac1b175eebc36b563b8a56930653a4422f98f982ae140006318853cf8daf7c5f4dab32fe418a723fb8819d1882c00d8f3ae45dbe5a8
-DIST qtwebchannel-everywhere-src-5.15.2.tar.xz 209208 BLAKE2B 486da1fb4dc8106343716536c69f9fe3251119ab844b36eace21ad1921840be3e0bb97db58d29738bb54a28d2ad85839bfa71a8832a9d84a40c32b0f285fc2e7 SHA512 7ac5e372695616863d247c5a61e5763a3934b58165e35c43da5ef1797d80005aa3d6eb258931ae7ee2b1f6a6fa743635ac4678c9cfe375cefa76e74cc81d095b
-EBUILD qtwebchannel-5.15.2-r1.ebuild 582 BLAKE2B 82846fda48800ab672fe7f1de8ba52c8b95b8eb4c10d622f9f2afb78cb0c69a92f32a4a698666a532166d2a23ce6c09b8f1770e2d864c9443f68d83dd0e5dd4a SHA512 ea75b3fcfb6ed378cd16f9b3c9427cdb2673b542450f01a292d2d0424ba3ca33cac47f4224363d6d57888d0dc796c6a6e2347a9dacfeec915142000b92036b16
-EBUILD qtwebchannel-5.15.2-r10.ebuild 643 BLAKE2B 5e8b8711e403cd3b8716a36dbc4a64524f569035bc06c46e9fad469f02b3f903f59e1d449489213a9d9de6d80aac58128d8a3793eb1541d11066ec0d1cf481b8 SHA512 6eb3aaba5f4ad2f1e9d6d76e320202e4cdd0794327cccc216e2597f3603b0259ffdb150cbb1cb5a5e38740995e0071f4cfc7356298f41c7ed3074d4702058de0
+EBUILD qtwebchannel-5.15.2-r10.ebuild 638 BLAKE2B 5988a858319784a64e3b710ea6bf05246f7106f9ec858ff6e2fa3ca345b75b9ed19e9dc74871dfa688e0d6ab64509527587ce993aef949b3b6f17bd833e04073 SHA512 6511ead67bc24956a6def8b8503321100e2c5490638b3a2256d430d3fb8f023bb3252e6f01fff298c59e94769248c6b8a8a8d9bc7c371e64b4dacb23dccb3057
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
deleted file mode 100644
index 1f5019a95f50..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r10.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r10.ebuild
index 8aaa921d570c..fbdcac63f8dd 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r10.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r10.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="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index c19ddb23b816..4e612b53bfd2 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,3 @@
 DIST qtwebsockets-5.15.2-b13b5690.tar.gz 434726 BLAKE2B dfc5f4fb3031a3ba689f520f0914b61bc815205b474590662d152cc79f29f00f4ad85930a9fa61f44545eae6e62f0e781db80d9ad296e122b5049bf096568349 SHA512 fd26f93e8b5395ff9ffb7d8ca2954ba031f6d680126d76b8c1ff82fdbfa99c19cea1e05518a281a7b8ea92f6dd1410393702c91507bca03c650f3f0f490b5e3d
-DIST qtwebsockets-5.15.2-e7883bc6.tar.gz 434705 BLAKE2B f8c8fbb0e369ad5ceed40ca62c2a7d6d2cdb3cb74037e9ecb487b0ec31757aae10ed6f61790c566e4431b59585fee423047c4687b41cdfc08e96dd46c2f964b6 SHA512 35b1caed6462083014bbb83c6aa81b441f67da7f0e3813fc47997ca4fecfe5423eaef5dd4ed3c37f42dd311eded0e6b36cce6725c7028047ca21b454ded9257f
-EBUILD qtwebsockets-5.15.2-r10.ebuild 617 BLAKE2B 05ab06a8995f01708e58edbed2cbc158363e226bc04810423bd39fe9538760617da2385d446be907dd98f3a1297a651219259627ecc3667e72183e5a0e9b2918 SHA512 829ca1981fc2b589fc3ea5f9efed6a13fcfcbe0e34d2bfe3bb82246c0d25d24a0113bd9fbe8907657ef9ae656313f88bef761c871077862d54fb76f885250b1b
-EBUILD qtwebsockets-5.15.2-r11.ebuild 622 BLAKE2B 722b808284bdd1a855ef7d73c3952fa36240685a4d782bfb2f9f1e3240a7db315285db76c8c260c5486950e6c622ddfa6937d897bc73d47fc1e63ebbfa5df590 SHA512 e1e6d58f3b770700d47351567a578d18e5370d8618cb44303792bd40b0eb6bee5de26f921e099971b44b9a0a72b104139580714f2323649f7760019defa83eac
+EBUILD qtwebsockets-5.15.2-r11.ebuild 617 BLAKE2B 63989ccb4c7b29aa7f5c77fb3e6cf50cf521d3e49b285a87fb3a7dceac4928ae63db807667d8cbd0f2a4213017e72f05cdf76d3a5c763621f9fa652ee10a5d37 SHA512 03caac0fd9004b15be77e2a429f63c69051cee50c42cca2ccc7a52654e41828950a9b0653cbbe0d9deb2f27cdee4114eada04051bba6814b124e67ee7626312b
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
deleted file mode 100644
index 3430a52d80fd..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=e7883bc64440b1ff4666272ac6eb710ee4bc221b
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*[ssl=]
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r11.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r11.ebuild
index b155dc7585af..28a5f5b9d771 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r11.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-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="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index e889f683fe6e..63f6e8e6aa57 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,3 +1,3 @@
-DIST qtbase-5.15.2-7c6c0030.tar.gz 67967537 BLAKE2B 623b99942e9df9bc8ac436a21503060845f9e3532aa0e02ccd927762382be26091878fbe092e80c0ac68bead51d09647e40e0cf61361d62ad226ed46b221132b SHA512 eb88b21764591246c5f04f63405dbfcd39afb737e96bb29c7721644b9aba3ea95df24ed9699acfd03a8c088ee72efec1fb0267aef8d665d5ec72ee75fc08ecdc
-EBUILD qtwidgets-5.15.2-r12.ebuild 1229 BLAKE2B d28d4f73de795d09da67f77f8c450e7f8f33dc6809f3113c8983ae430aeb817d179ad6cc16cdae7587d491ece5cca0ac66a84fd4bcd79d8f3206340a1828194c SHA512 34e5daa36f26b531052bb5829ac7fe4794c0ba492c14c195389cbccd92393693160000b6e5c5785673d4437c0c07e265f9c30915f2ce1e5ae4f26b32e745a261
+DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
+EBUILD qtwidgets-5.15.2-r12.ebuild 1229 BLAKE2B 7fbd2126ef2e830bbda8f3f4dd83f6a98581f2e671b4946d2247de0e85b398a340e557bb614c69ccd602918acae51cef0ca3961ff968bf7be476fa774cf3c49a SHA512 12a70fe42cae892c9e169b8992fa2cc2bb2884e28c6e977eaf62e18c9e1aaaa570f2cae04471a7c1610c98c5c3b9e98f70d4453803aac71049eaee72f3e61401
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
index f2855eb3220b..3b8302515b6a 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-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=7c6c0030cf80ef7b9ace42996b0e0c3a72f76860
+KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
 QT5_MODULE="qtbase"
 inherit qt5-build