gentoo resync : 09.07.2022

173 files changed, 103 insertions, 3547 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 2191de158702..1e77e60874b5 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 6c2bebe7f2dd..11ceb38d1f77 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD assistant-5.15.4.ebuild 1294 BLAKE2B 4d82a7c93d76936baabfaf3cd4530b697fddc75673765a19c66dd2421265be1f14772f2ce9d6360cef16b4c9d1b5a9549c9a374f41e6419f951b533958e9d64e SHA512 6e7623f0aa3756d84cf9e9349995cf43326ac2bed50c5ea55ff686ec13a5e3d0eb00a4571f1902bc89b42c1fb85a11c36cb88bb438ee5df4dcfbb6d3859a0bf2
-EBUILD assistant-5.15.5.ebuild 1298 BLAKE2B 27b7c81c58e60f80780af2b2eefe224166e98bcb6ca2b74aa598f7aa271a7eba536f9d368becc3d09c6efd6b65f30a9b3c5fa4bc1eb321b93bbbbcbfec2f46fa SHA512 5640534163a406708f08b75669969128ee8dec50c3544ef02c2453886c909b555f4c46e20ebe3dd5851c0723de86cf7d4761ccc33af61963f079a67e5010a84f
+EBUILD assistant-5.15.5.ebuild 1294 BLAKE2B 4d82a7c93d76936baabfaf3cd4530b697fddc75673765a19c66dd2421265be1f14772f2ce9d6360cef16b4c9d1b5a9549c9a374f41e6419f951b533958e9d64e SHA512 6e7623f0aa3756d84cf9e9349995cf43326ac2bed50c5ea55ff686ec13a5e3d0eb00a4571f1902bc89b42c1fb85a11c36cb88bb438ee5df4dcfbb6d3859a0bf2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.4.ebuild b/dev-qt/assistant/assistant-5.15.4.ebuild
deleted file mode 100644
index 3aef877d922c..000000000000
--- a/dev-qt/assistant/assistant-5.15.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[png]
-	=dev-qt/qthelp-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtsql-${QT5_PV}*[sqlite]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/assistant/assistant/assistant.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path assistant
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/assistant/assistant-5.15.5.ebuild b/dev-qt/assistant/assistant-5.15.5.ebuild
index 52bf83ac3a7d..3aef877d922c 100644
--- a/dev-qt/assistant/assistant-5.15.5.ebuild
+++ b/dev-qt/assistant/assistant-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 0b6472011d66..1e5c62b321d0 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD designer-5.15.4.ebuild 1305 BLAKE2B d34c310f6df1c8ded660fd02850bb092d917ceae30d9e8ecd122ef9ef4fbefbfb075eebd16b520de8e40ce5680c33ba65aa223ec17b84ff681b7986ab213297b SHA512 2564e590d1e3eaddf593be70f59ec107acc3be4eb62ccddd22da7d15ae431aa8770fc26d4bf702187acc3bfd7ce5b28fb75cb2e0a43da8d15511307b75d20233
-EBUILD designer-5.15.5.ebuild 1318 BLAKE2B ed8ceff17589a417e91bf602560014efd5f98d060c4d29c2f694a27a05600e72bfe30af56577ea7e3bea0d1b967165b239ea4f8bf6135d4fab21c76d636e95ec SHA512 362febe3f569d6f8792ddd569f55ade08f7418a5cfdcc016d8e4c4760594e5bd1a75147cee6a1cfb73255a9579613be04e6f664e60d3c7c05f43c6b61e7a05a7
+EBUILD designer-5.15.5.ebuild 1312 BLAKE2B cbda84bf90348f0412ea2dc9032d6b51b4f6e33a74fec1cb0a9567a6834e031b62957a4a08d67c76bbac8e491333b7072864a16ead730f8791a18c67808d02e3 SHA512 9136d5e22601b294f691ea5f13407bae5c4a462134c0573a5b8ede85d10f27980a46c83d2012f94128198fb8bf26e97e7690e8009dd9ad1be1e5f79d64751e12
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.4.ebuild b/dev-qt/designer/designer-5.15.4.ebuild
deleted file mode 100644
index 3e0bd60eb5d9..000000000000
--- a/dev-qt/designer/designer-5.15.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
-fi
-
-IUSE="declarative"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[png]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-	declarative? ( =dev-qt/qtdeclarative-${QT5_PV}*[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	sed -e "s/qtHaveModule(webkitwidgets)/false/g" \
-		-i src/designer/src/plugins/plugins.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path designer 5
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/designer-5.15.5.ebuild b/dev-qt/designer/designer-5.15.5.ebuild
index dde64f6e6a6d..e3c7c976377a 100644
--- a/dev-qt/designer/designer-5.15.5.ebuild
+++ b/dev-qt/designer/designer-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
 IUSE="declarative"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index ec3102b91cd9..429586897cdc 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,3 @@
-DIST qttools-5.15.4-gentoo-kde-1.tar.xz 1320 BLAKE2B 6e25237a0c36380e55dc48c04bc01a9d1ac0d398f47bde09ef2435d97267a38a5c74af856ef4544727292c3aa0bf10f305529b7ccc24b4565c60119dd5597559 SHA512 19ea717ccd5c053037206cdd2dc533f285306c207fcc0daf46fba6e2d6fcde3561043b45da4bc830bb181bad46904b191149b65c5bb76414bd975f1a4706afef
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD linguist-tools-5.15.4-r1.ebuild 736 BLAKE2B 9b8d5008bbfe877a75e41935414007ea330f736686720d47c83ec86f721d85a8b48d428964af06c3cdb65b208712848a24c162cc6b56e88899d920e693b7eefe SHA512 cde92f98d5f925ac247e8d52a44dc9e89dabbe77e76dd5abfc781954254ab452796cc86023d4048d84266d98976b37ca5388f776216464abf0504f07da8b4c45
-EBUILD linguist-tools-5.15.4.ebuild 712 BLAKE2B bb33f838b3cf109e13e88a116493d6b68d6db5dbcd1a859426769827534d4c5a8ee15091e10f226df569a948819a4f3bf31183f3aaa5fc99bf095f53330263bd SHA512 ca8aa7a2e5b737a1cb510b9b98291255811b998e99b32e8559283bee9f1b08ba1fea944bff06a5f2048b60064c3d77a876f9f0b5a442b55ffb4736e7c2ff4b57
-EBUILD linguist-tools-5.15.5.ebuild 718 BLAKE2B 1133cffda134b2c7e04c723508fa4adbaa42a9ea546214efc41f68e786fafaabcc86b69791963620c23e65d68edf54b603f635a7fa97761aaa87bab7477ffa4e SHA512 0a46b95544eb06ef4fde1a72f6530ae1ecf5db32ec5876358724f06047424bb009ddd69bc404dc8c8cf54ef187e9cb94f162ff09411d23a7c0276c14ea647f5c
+EBUILD linguist-tools-5.15.5.ebuild 712 BLAKE2B bb33f838b3cf109e13e88a116493d6b68d6db5dbcd1a859426769827534d4c5a8ee15091e10f226df569a948819a4f3bf31183f3aaa5fc99bf095f53330263bd SHA512 ca8aa7a2e5b737a1cb510b9b98291255811b998e99b32e8559283bee9f1b08ba1fea944bff06a5f2048b60064c3d77a876f9f0b5a442b55ffb4736e7c2ff4b57
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.4-r1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.4-r1.ebuild
deleted file mode 100644
index 2c02a41ea2ed..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtxml-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
deleted file mode 100644
index 950bdf97ea52..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtxml-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.5.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.5.ebuild
index fa97b5836283..950bdf97ea52 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.5.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 27cf0faf02ae..97a8cedaaf34 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD linguist-5.15.4.ebuild 1094 BLAKE2B dcce645d99b9c310e9a03831d22b5a32378ea2432f578c147ee54599fe16eb4c592b948fe78c49369c3bb81aa3e9cebece81c65059fdbe7fd376afc72e5503fe SHA512 4418ca32210f91110ef58affc888387be26afcff0d2b7bf77d5eac360ec4e7f1b217cded53f5a0ae1905183814ccde52f3aac59e5d15cea23f1c800941e2e289
-EBUILD linguist-5.15.5.ebuild 1098 BLAKE2B 8ccfde72124bd221b60eb75a5cab2db269d7bdbf31bb4655ff91f033444bfd7e1d914b3fc1c5b46c3ce0f6b1e5c3e5d1ea5eccee35f04251848aef26ab1e2723 SHA512 8964ac855d99e8b654d41012f11e2dfe125ee1958aae9f89203acd3440d7d118be270d229877bbce6007bcdd32fd1c1c565accb7f97651938c3047f1af528d85
+EBUILD linguist-5.15.5.ebuild 1094 BLAKE2B dcce645d99b9c310e9a03831d22b5a32378ea2432f578c147ee54599fe16eb4c592b948fe78c49369c3bb81aa3e9cebece81c65059fdbe7fd376afc72e5503fe SHA512 4418ca32210f91110ef58affc888387be26afcff0d2b7bf77d5eac360ec4e7f1b217cded53f5a0ae1905183814ccde52f3aac59e5d15cea23f1c800941e2e289
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.4.ebuild b/dev-qt/linguist/linguist-5.15.4.ebuild
deleted file mode 100644
index dd8aad472710..000000000000
--- a/dev-qt/linguist/linguist-5.15.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/designer-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[png]
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path linguist
-
-	local size
-	for size in 16 32 48 64 128; do
-		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
-	done
-	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/linguist/linguist-5.15.5.ebuild b/dev-qt/linguist/linguist-5.15.5.ebuild
index d88d8a7a9f63..dd8aad472710 100644
--- a/dev-qt/linguist/linguist-5.15.5.ebuild
+++ b/dev-qt/linguist/linguist-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index c8d55f5ac013..380b73febfe1 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD pixeltool-5.15.4.ebuild 585 BLAKE2B fb9ea9fc7042134d49167aa27551ee65862ad4d0ac0d915266b2a373b9254c949aad38903def225113ca0f78729a67ced4e8b2848db2525a0046a29fd5b58086 SHA512 34e540f357969a7ea9ed160867ba3989c74ab23c9cf33b3230696839cecf6a4935cebbc9941bdec8545d6bb688a8032df5ef261514c539d6e19f56fa6e17124c
-EBUILD pixeltool-5.15.5.ebuild 589 BLAKE2B 08f1e79cb0693fd3fec47ba247602064e8478879921894a24376541733cede45f26b1c71141760953467558a3309dac23f981f706390bbced5875a53352cb8cb SHA512 f6227d5fcfd0e619608ee164bb7ea517d59c56b0ad78c357a143ce9c708e32759260f9b88bcccf6ac1719182bc62ec55e639af00d54133ff7db99b2519e0c7c5
+EBUILD pixeltool-5.15.5.ebuild 585 BLAKE2B fb9ea9fc7042134d49167aa27551ee65862ad4d0ac0d915266b2a373b9254c949aad38903def225113ca0f78729a67ced4e8b2848db2525a0046a29fd5b58086 SHA512 34e540f357969a7ea9ed160867ba3989c74ab23c9cf33b3230696839cecf6a4935cebbc9941bdec8545d6bb688a8032df5ef261514c539d6e19f56fa6e17124c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.4.ebuild b/dev-qt/pixeltool/pixeltool-5.15.4.ebuild
deleted file mode 100644
index db1ecaf154f6..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.15.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[png]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path pixeltool
-}
diff --git a/dev-qt/pixeltool/pixeltool-5.15.5.ebuild b/dev-qt/pixeltool/pixeltool-5.15.5.ebuild
index cd1802477ef5..db1ecaf154f6 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.5.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 5e0502ec456b..a99c2a89ce32 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD qdbus-5.15.4.ebuild 614 BLAKE2B 93fb40b37422b9c5ef9f03545eecf7139d364cb92feb4c5609686da2f9443a074476d821e8c96d9e96d1454c1f2c3c39468f37a6291f9467e485c89b478e401a SHA512 6a8317c524560070f139e8d1d5121e7ba554a1546ecbaab4cd322a528bede75bd7ecc1b946416c15c7e19ce83a69f475fca4c7eb4da78c0c82a4f4d0509d21bc
-EBUILD qdbus-5.15.5.ebuild 626 BLAKE2B 6c6e36718f4443200f4d5e76b1349dd0efe4e183bc6d475c3b678fe4d3ff8a35c1c36dd4107f9e3effdfab7231f7d2cf6946c6d5e57a5a0b1a4fb2dde7b3b564 SHA512 89141cf5362c6f0c0245c1d68319937f6d27a3fbaaa1de334d8804420046f4eebaeb55ca6aa7cd3e0a1a61122f8a3e15504b0da955039a847f5a9f71ee43aa0c
+EBUILD qdbus-5.15.5.ebuild 621 BLAKE2B 18aac78436f24f359892e3a5e4a4fd400eb8fc33c176c8459d81e519b0a89bf396d640a744d160b531d754449bc05718c319f1a3ee4289912235e651171ad1e1 SHA512 2341c88ebd2f56d23240132930758473f9aca01d1f189fa70cce46a28e92d5c4bdfa9fa7d22cd167ff65c17aafe45086424a57ddbad7abfda720eb26195220f8
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbus/qdbus-5.15.4.ebuild b/dev-qt/qdbus/qdbus-5.15.4.ebuild
deleted file mode 100644
index fbda1799b4cb..000000000000
--- a/dev-qt/qdbus/qdbus-5.15.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdbus-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qdbus
-}
diff --git a/dev-qt/qdbus/qdbus-5.15.5.ebuild b/dev-qt/qdbus/qdbus-5.15.5.ebuild
index fd19b238c162..7247c2b432ec 100644
--- a/dev-qt/qdbus/qdbus-5.15.5.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 12c897c1e3fc..6552f9983e3d 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD qdbusviewer-5.15.4.ebuild 1069 BLAKE2B 14f733a6ec51c92e4c082940abddeb321dd84be0a06982f0768bcecebfe5a40bafeeebbc7218d0d29ea296818f33f86d688aacebbcebb73b21f4ad2547007815 SHA512 d37cbf2899191b7cc6f0756f045ed93b638a5ae76e77949fcc9a75418eec196df82f8d87af8fbd9022bf92ee3e187c52b9cf695bfed7df956185499ca4c09eb4
-EBUILD qdbusviewer-5.15.5.ebuild 1073 BLAKE2B 7ee1e1e3ed0077221b31aa718bc1cd560f3514eab83261bfa0dd07301ba9135537a94fa5e1a8d67dc885040388e9c12270ebf14418827c567e6788534d9a4ee4 SHA512 a98b7f697a70efd1c9eb4fc6949559fb29c3010f7247f53c49720edb1a53e2c2270db4044b2b0f92acc0a84fa06803a4412fbff56be78ee7b8b9a46c66e643d1
+EBUILD qdbusviewer-5.15.5.ebuild 1069 BLAKE2B 14f733a6ec51c92e4c082940abddeb321dd84be0a06982f0768bcecebfe5a40bafeeebbc7218d0d29ea296818f33f86d688aacebbcebb73b21f4ad2547007815 SHA512 d37cbf2899191b7cc6f0756f045ed93b638a5ae76e77949fcc9a75418eec196df82f8d87af8fbd9022bf92ee3e187c52b9cf695bfed7df956185499ca4c09eb4
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
deleted file mode 100644
index 1cbc8214ea55..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdbus-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	=dev-qt/qtxml-${QT5_PV}*
-"
-RDEPEND="${DEPEND}
-	!dev-qt/${PN}:5
-	!<dev-qt/qtchooser-66-r2
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qdbusviewer
-
-	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
-	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.5.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.5.ebuild
index 3394c5f160af..1cbc8214ea55 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.5.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 7a9f6269fe70..00ebc7337629 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD qdoc-5.15.4.ebuild 828 BLAKE2B 32b639569f782c96b1fcec85ba86e94b69019cac9621c6cb720ef71f36456fd1cbd048a4c833f1eda29f78fd34755f311d60cac9158a9e207cb035ab7abb84f0 SHA512 85ef7be7123e7d3d650585a7730777372dd756f1f13b188dbc2becb6e3983b57d53db07b04ff49b116d9b3b92220b0c0e58fb06ebc56bbf0c435c7a6d6f29da4
-EBUILD qdoc-5.15.5.ebuild 831 BLAKE2B 4ff9134da6fa3b1fe9aa30f08c435169f477b4f3a85b279c18944deeef3b5ef72936577d3783ffa1fb0cd24c59a876e67938acb34263cb5d1585cccca35b8b74 SHA512 af3a085112d77da9522e58da50cdd9e82ac73b247dc686a402638f3c79b3e0ff127066e186d0ccdc8ea486c0dbd7d07f32e3c1cdb33d05e63520e22f14898bfc
+EBUILD qdoc-5.15.5.ebuild 828 BLAKE2B 32b639569f782c96b1fcec85ba86e94b69019cac9621c6cb720ef71f36456fd1cbd048a4c833f1eda29f78fd34755f311d60cac9158a9e207cb035ab7abb84f0 SHA512 85ef7be7123e7d3d650585a7730777372dd756f1f13b188dbc2becb6e3983b57d53db07b04ff49b116d9b3b92220b0c0e58fb06ebc56bbf0c435c7a6d6f29da4
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.4.ebuild b/dev-qt/qdoc/qdoc-5.15.4.ebuild
deleted file mode 100644
index 8da082dbcfde..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-devel/clang:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	# qt5_tools_configure() not enough here, needs another fix, bug 676948
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qdoc/qdoc-5.15.5.ebuild b/dev-qt/qdoc/qdoc-5.15.5.ebuild
index 80459c8d4436..8da082dbcfde 100644
--- a/dev-qt/qdoc/qdoc-5.15.5.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 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/qt3d/Manifest b/dev-qt/qt3d/Manifest
index d49e36b05fc2..bf50c4b0dacd 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,7 +1,4 @@
-DIST qt3d-5.15.4-gentoo-kde-1.tar.xz 18844 BLAKE2B 2ed592d7bbf5bb4c0adee70ac74fd46207e78e769b19d083d6317d1d561618135769914ac8b4e9d266c28b09764e89fe5dbbe2237c81ff48b27efff99a0ee5a1 SHA512 bca5329a68a1ffc5b679db847a1b327e746170fb194a091feb1a61dbf6fe30b3af1cf9c9c57a3a1b16c6af4a0529bbb309eb2bd269613d65f666203164562cd4
 DIST qt3d-5.15.5-gentoo-kde-1.tar.xz 17820 BLAKE2B 1c8d47a478926a4d9db81ead014ed078061e4ae19b80e581df2adecab1d6c8f29a1e2ef548e4267f29d351f8df5b5be53c4648c78ca5e40463e20f7c257d8211 SHA512 3b7b3f2eff33c7ccff31e9ef9dc8ad916ac365749ba50adc04ab1600de5a4f793eab58859ba18cd3244ceb5e9172f1fc70f02fdca5da3239ae657d3d116a2959
-DIST qt3d-everywhere-opensource-src-5.15.4.tar.xz 81923836 BLAKE2B 60ca6a00bec8c20e1b2c209e4d15dd5b2e836eb578c98a90dbf02db89d5fc07642106cc0248a1fb356694793f5fdb5e3b6ab9898bc4e87730c379cbd3d1d8a48 SHA512 cb2ea961109a153e78147450310408f4f573186d12412ebdd71511eb273ca78113d3aede583ec8aa44fe19f5268bb6fab3386c5501142ad6a22e10890ce52f62
 DIST qt3d-everywhere-opensource-src-5.15.5.tar.xz 81935728 BLAKE2B ccbc802ff29b6b8230d544ea1a68770b1e207933a714fbddf69114bcafa4d599ddfb76c938aa27bdc644a8a6106a39b7f4f906d63926510675ca6c79f6b6ab5e SHA512 92c1af2ff6c3d5c8f570f93c06ae58ec14ab8c8bcbf08fdd8ef8babc497d0883c2322b163035aaa743b7e27774d9b1e97a1d4271f6b8fbea0a480985aae13fd6
-EBUILD qt3d-5.15.4-r1.ebuild 980 BLAKE2B 9f4d84ee6689755353fd499c939fed86fb0f74ad03191d8440b3a1fdec463a4ad606f7139efa681ab82f967c76aba4e8581157f2b79cec942c8799a36614eff8 SHA512 a1c31558e7c17195d336876ede7f8b6adaee21afe988b773b1e8472deaf845ca9513966ebe9858ac78e8a619b200915e3b404332c77dc7a925a9be61ed72f551
-EBUILD qt3d-5.15.5.ebuild 983 BLAKE2B 62d7104de9ba103301c2eb08fa12773824f35ffd93796e1b8f0d7acae560a95df9a114861ba3ac0d00e52c7fa8f6f1541522e0ab6407b386d9a90a2a05e3cb02 SHA512 f0252e15888f8dfa7cce4828564dd1a53e72097b252e3e36a23c8b80fe618eb16bfa554c52e296f03cbeddd062a29844dc603786f712e46ce60f1685bf436a0f
+EBUILD qt3d-5.15.5.ebuild 980 BLAKE2B 9f4d84ee6689755353fd499c939fed86fb0f74ad03191d8440b3a1fdec463a4ad606f7139efa681ab82f967c76aba4e8581157f2b79cec942c8799a36614eff8 SHA512 a1c31558e7c17195d336876ede7f8b6adaee21afe988b773b1e8472deaf845ca9513966ebe9858ac78e8a619b200915e3b404332c77dc7a925a9be61ed72f551
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild b/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
deleted file mode 100644
index 0b8ba72cc7f2..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml vulkan"
-
-RDEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	>=media-libs/assimp-4.0.0:=
-	gamepad? ( =dev-qt/qtgamepad-${QT5_PV}* )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
-"
-DEPEND="${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-system-assimp
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qt3d/qt3d-5.15.5.ebuild b/dev-qt/qt3d/qt3d-5.15.5.ebuild
index f885392a724b..0b8ba72cc7f2 100644
--- a/dev-qt/qt3d/qt3d-5.15.5.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 # TODO: tools
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index bce072d631a9..6485fcf0ff4d 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,7 +1,4 @@
-DIST qtconnectivity-5.15.4-gentoo-kde-1.tar.xz 3384 BLAKE2B 4dfddcfb0ba91bad7126fafa5f202f0d4d0cd7585438a9842ccbe4ba0bbeea98e74c11dc87cff48fc033fa17d66adce3d9333c9d2d2a91ad54308251ee3056eb SHA512 a5ded5e0bd97273d3cd5ba8abbd1e518dc70facbc5fefe78a18b4d8d7968042a899b4bd2bed4daccb308afd298e6842c93ebf2963b1927f8f146e042c5328d60
 DIST qtconnectivity-5.15.5-gentoo-kde-1.tar.xz 3368 BLAKE2B 30e4c302e32486a43e13795c053df224dbc015881c537cdeabddc4ec714f380bf5bb0219780962c03dcda133245c1ed3bbd2de49f45afc6af1a1a3f962af9f40 SHA512 6caff86ee9ca219a44ca38bd1aa93ffc45186be113d120fb87c773db52149e9005f993f248baaa4cca91026e67996b07d2fa7f5cd08bc7fe4bfc4c5ef238b51e
-DIST qtconnectivity-everywhere-opensource-src-5.15.4.tar.xz 2816924 BLAKE2B 73edd81da73a1438a4e33d3b553259865c7fab0b97213935803b17b00444f737407baa665c31b0e708f1efef7c0eddfd6706f2883a563847a28ecd5ca18b9429 SHA512 3f2c0a59ff6be9531f5ebc81a4344e0b12c8ef92fbfa466f2777d4ed3b4b08657214e93e0aada856a0c6475b6b760aeeb06f0b2be894e61cd7b344c49fefaf95
 DIST qtconnectivity-everywhere-opensource-src-5.15.5.tar.xz 2817040 BLAKE2B 48f2eb677112cb6277dba32d54e5308ea1772b74578f0435b7ee8e0a0185ae80375a92c4a9b7663cc473731276db61371a39afe498b1e3209049a1cec386c01c SHA512 21fa34f6ba500b214e526aeb34308df6be6a42ac11f898f91874e1a32ae5be6f23430257a8af77e3e8b4210f17f4fdf48616500c6c9e77bb3587ceb0eb938d2b
-EBUILD qtbluetooth-5.15.4.ebuild 697 BLAKE2B 89cb0cc3e265d6d11870951f3d479ed82eea250307491a0103f2bf56d5652ec8158db68aec83a7870a2affdbdcba0359459c4f9b9fff1636efe06933d1f5f22f SHA512 4f8dad6d4b73522a4761449f88b694a30293afa99e5a72a8804a4aec211f6829aa21f422ee88ed62c6c2cce67d86c7e9ab46e32ee735927d97d310a97d753898
-EBUILD qtbluetooth-5.15.5.ebuild 701 BLAKE2B 9dedcf859dfca643d1c1e888bb7f44a6e2e3abf3d9f562a1a960cd726ee6c79d5c27f239cd61e2754439db5b0ad50d27b127a01d79bedba3d8d8bef011c57ecb SHA512 07b4c14958c1d14139cc6c68eab5f372cc32c05d7514c1e3ccffdb9c5bc9ce9bd7dc09b54f435807fb294e2e0060468f6e480cf21e75ab2afe69671afd421e0f
+EBUILD qtbluetooth-5.15.5.ebuild 697 BLAKE2B 89cb0cc3e265d6d11870951f3d479ed82eea250307491a0103f2bf56d5652ec8158db68aec83a7870a2affdbdcba0359459c4f9b9fff1636efe06933d1f5f22f SHA512 4f8dad6d4b73522a4761449f88b694a30293afa99e5a72a8804a4aec211f6829aa21f422ee88ed62c6c2cce67d86c7e9ab46e32ee735927d97d310a97d753898
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
deleted file mode 100644
index 6fe2898f1aa7..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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"
-
-DEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdbus-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	>=net-wireless/bluez-5:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-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.5.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.5.ebuild
index b99e015a61f8..6fe2898f1aa7 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.5.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.5.ebuild
@@ -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/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 7b8bcc51cbf5..e915ad3cce9f 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,3 @@
-DIST qtcharts-everywhere-opensource-src-5.15.4.tar.xz 4253512 BLAKE2B 833ce3ab26feff3521aa8d67b276f2a67c0efa595309870288bb543ccb7b70f73ff8004a0e5f895a0458352cc56479ba0f43eb5694f9cdc6ba8a7f33da89968c SHA512 e7a4cac3b3a0c60c7ab509d5a533521dd8dc0cb5ad69d66a87f12671c73c1928d902e0be377efb77e0ddadefe1ef8800c0cf07e8213f44367bcd80a787342bcf
 DIST qtcharts-everywhere-opensource-src-5.15.5.tar.xz 4254052 BLAKE2B 73214ee96bf56c19889f01608259ee067f39025f9d42a18e25058060faf320c6f83c844500104f9ef858c90d59c7f5de616e6d9ec6c9e790873d70ea2bf5433c SHA512 4ee495e932b288b18d0375b754036ecfda2447284d8a0c08b06be4588c4d5802856b2ee2ac3582427ffd08a7f4ba47626ede6524b6289acc0bbe66df0fe14ec7
-EBUILD qtcharts-5.15.4.ebuild 565 BLAKE2B 8ab6d2075b6807877478f3cdaba7003a959004cb6b7dec6921833a2506640e48cf632bfb6c0da93d746ba0eaa5500042829a5f77bbedbb30bccf3d7de5a6a4d1 SHA512 afc80ada7941d900db3b9265d3f967fbfa722832f6388f7354de92f5030fa3969931a3f30267a0bd7eafc659831252705fc4b057f9da2d03cc59eff9fd80ea34
-EBUILD qtcharts-5.15.5.ebuild 570 BLAKE2B d74c16dd69f63bfb5eb0d31333b1d170b9974c15e7d7daa6b7f86bce52c464b4be1121a3567ed363d01e0626ae93fb2ef47c918a651bdac36e15ea961a2b7431 SHA512 5bd6c4669f393692a3e4076c58546901ca8dbb0d5461b841e69877c3e4522ea64bdf8c2f0c7736f2b05159f6304bae5172a2ee5c9573710437adcde7f952976a
+EBUILD qtcharts-5.15.5.ebuild 565 BLAKE2B 8ab6d2075b6807877478f3cdaba7003a959004cb6b7dec6921833a2506640e48cf632bfb6c0da93d746ba0eaa5500042829a5f77bbedbb30bccf3d7de5a6a4d1 SHA512 afc80ada7941d900db3b9265d3f967fbfa722832f6388f7354de92f5030fa3969931a3f30267a0bd7eafc659831252705fc4b057f9da2d03cc59eff9fd80ea34
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtcharts/qtcharts-5.15.4.ebuild b/dev-qt/qtcharts/qtcharts-5.15.4.ebuild
deleted file mode 100644
index 0d69b9f5d0b2..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.15.4.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Chart component library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	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/qtcharts/qtcharts-5.15.5.ebuild b/dev-qt/qtcharts/qtcharts-5.15.5.ebuild
index 9f42180ede9f..0d69b9f5d0b2 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.5.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
 LICENSE="GPL-3"
 
 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/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 51c6dc886379..e76fc7204ca4 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtconcurrent-5.15.4.ebuild 482 BLAKE2B f6f93d1439f8b280891d63be609ca31d81dd58e655d109f137b24cea79517771e7b10fc501f24537a4f3617448148658a0074e9b97090bb6dc9a3a38e0eeb126 SHA512 71a36bb5d57392da512b20c8e65a53c99c53e81da6d6b3f582aeffd517614ce4eb6cb74811588c78e74fedb96892c1d6994d363e4075aff63b0ded1ec51cbc64
-EBUILD qtconcurrent-5.15.5.ebuild 488 BLAKE2B 1f28456e46e3a19be5a5d9750274489e141c7ef36768d5ca8accf96552496e74a07e07b1f62609aa0c7df06e68bdbfd34d1c078d26de10a69b064014d848816a SHA512 6c5d458aff62a6128989b09bbcea5b63fa8c671ae3fc6b788c8bbe7076651d4453a057a56eb34d816f9c63c21852fab869c737edcf7a10ac4ac215da0b282230
+EBUILD qtconcurrent-5.15.5.ebuild 482 BLAKE2B f6f93d1439f8b280891d63be609ca31d81dd58e655d109f137b24cea79517771e7b10fc501f24537a4f3617448148658a0074e9b97090bb6dc9a3a38e0eeb126 SHA512 71a36bb5d57392da512b20c8e65a53c99c53e81da6d6b3f582aeffd517614ce4eb6cb74811588c78e74fedb96892c1d6994d363e4075aff63b0ded1ec51cbc64
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
deleted file mode 100644
index 8307e75b3263..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.5.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.5.ebuild
index 4996bc7f4fd8..8307e75b3263 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.5.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index a35f024d7167..f599a48e4cc0 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,13 +1,6 @@
-AUX qtcore-5.15.3-pthread.patch 1570 BLAKE2B f484f7aab89ba92bc33861abc1a4c5fe5f15139a7b14bb6a84a02d8f064dd6465d6ad3ea39ee35cdbb2dae6a2879a824b23068b8e94d3a6ebb2e6639b11a1612 SHA512 492199fdd7f7252c9ec03ed735a015df51e8de7aa2b20b2a4bb391a133e1dd0d88ce9dbafb600071e07abc9b426a9040f64a738361b71dd891186a59087515e4
 AUX qtcore-5.15.5-fortify-source-3.patch 2353 BLAKE2B c2eaf28a3daca0ccac7ace1f8a915f44e705ae848a9e5e46756a77178a442345c8d6b1c3d3dfec1fa092ac0e7ee2d83b2cdd825d8471cef3b2b81444e99587f2 SHA512 df7e570417564d14993eb91fbaf691a15bea896b3ee6a8b7f5ac654b74fccda9f7dac52f022626df8aa3955aac073250d7b50840fd3aae3aa443f180084d29de
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B 315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08 SHA512 ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c
-DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B b7f94dd5315b9a16647c2d035fefc9021c4fcfe72a9010713ff6e47ebd1aca575778a02f96c81256fd38b6b58138a6ecd4ce046a6e4e3b0e0a4edfc64100c4f0 SHA512 f616fbd226390e8995008d22dbc35607f26eb5feaf436cd9b35d9ff0c2e428a4b75d0c91ba28660b488b03e1acccf8a2998dfdfc988335b3b37f6b6ae17106b3
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtcore-5.15.4-r2.ebuild 2956 BLAKE2B 32119950e009c6fe4d5505041b9983df746f4e81e1bb3c11aa9ba8ad64833ec6e74ffc006d5c4714a9f790ca6c43c20d1248737bf6106ddc8074a7754bedb154 SHA512 c59634fd539c68b6248300e7f219510a879cda5c9328a410224a42041599afa65e941b40a43b60575f26751506a96f93fddae0e46d394992e89a062657b754a9
-EBUILD qtcore-5.15.4-r3.ebuild 2958 BLAKE2B fadcaebdc061509ca1ba53db9e08c876907ee1815edf160ca7343a21b1bb4be5cfcebae2cb3ade0d7540e76cd0cf4e3132ab5133f878d475bec6bf9a9c22a16e SHA512 8a4aa2bce191f9a524a487e48facf5fbd09690e1e944b9d390a1ca42a6b872997f3baba9a91b74df63d9d9e6983b8fb36bcf70e1bd18bac3d1a1f03683de8c7d
-EBUILD qtcore-5.15.5-r1.ebuild 2219 BLAKE2B 91f69a07bd8f3b8a5cf83afb7f2e8cbc3f4b4971d75b8b4e7d24cbafc9606ce498f079afa4af58414d3d46ec44029bb3f17a0c55b073691da7d6a0bdd22dc7ff SHA512 a69159b1814b2b5493c54bdd8e9ccd9478b7f8993b227e1c74a64bdd490805254e3cddb63db0c7f40cbe6f3e8f4dfe32e7df0a5fea5946fb850e2b6e0d391540
-EBUILD qtcore-5.15.5.ebuild 2894 BLAKE2B 1d2ae5d8eb978b55b53dceebac8b45cf6f46503ead0747e1a152a14378fd5bfdb4a903608e6a358af220c65387eb4921cae932866e231f04ed29511af37fe2a0 SHA512 256058b5c47de92fe9880af0f33df97f7804d555f700c3dc957f928b4aa98e5c9109fa57334c3cdae02eec89faa1985c9866534516856beafdee7dc26feeb7a1
+EBUILD qtcore-5.15.5-r1.ebuild 2213 BLAKE2B 071bb5ba9e3351cf11b7efc40b30a7df80c49d9d36520abe53aa88e412c380fba5b0525c330d41fe4bf0ae3ad79ef8f38b5bb29596b9c26013f9a59a1eace9b7 SHA512 53a00e769a6cbb916a184404597c0abe5627cd3fe67f0e6fee9b468163480c4ba1c61e723ad459da58f75cc656b965f3db058704b3e54e9c2c43e69dc160de9d
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch b/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
deleted file mode 100644
index c83c59ac3113..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.3-pthread.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-# Use link option -pthread instead of -lpthread
-
-# https://github.com/riscv-collab/riscv-gcc/issues/12 use Option 4
-# https://stackoverflow.com/questions/23250863/difference-between-pthread-and-lpthread-while-compiling
-# In riscv, "-pthread" equivalent to add link option "--push-state --as-needed -latomic --pop-state"
-
-diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
-index 544cc227..add969be 100644
---- a/mkspecs/common/linux.conf
-+++ b/mkspecs/common/linux.conf
-@@ -33,7 +33,7 @@ QMAKE_LIBS_EGL          = -lEGL
- QMAKE_LIBS_OPENGL       = -lGL
- QMAKE_LIBS_OPENGL_ES2   = -lGLESv2
- QMAKE_LIBS_OPENVG       = -lOpenVG
--QMAKE_LIBS_THREAD       = -lpthread
-+QMAKE_LIBS_THREAD       = -pthread
- QMAKE_LIBS_VULKAN       =
- 
- QMAKE_INCDIR_WAYLAND    =
-diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index 9b5d19d4..da028fb2 100644
---- a/src/corelib/configure.json
-+++ b/src/corelib/configure.json
-@@ -355,7 +355,7 @@
-                     "std::future<int> f = std::async([]() { return 42; });",
-                     "(void)f.get();"
-                 ],
--                "qmake": "unix:LIBS += -lpthread"
-+                "qmake": "unix:LIBS += -pthread"
-             }
-         },
-         "cxx11_random": {
-@@ -466,7 +466,7 @@
-                     "shm_open(\"test\", O_RDWR | O_CREAT | O_EXCL, 0666);",
-                     "shm_unlink(\"test\");"
-                 ],
--                "qmake": "linux: LIBS += -lpthread -lrt"
-+                "qmake": "linux: LIBS += -pthread -lrt"
-             }
-         },
-         "linkat": {
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
deleted file mode 100644
index 8f50567db7fb..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=2
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong 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}"
-
-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.15.3-pthread.patch # bug 803470
-)
-
-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
-
-	# Broken with FORTIFY_SOURCE=3
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	# Refs:
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-	# https://bugreports.qt.io/browse/QTBUG-103782
-	# bug #847145
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		# (Qt doesn't seem to respect CPPFLAGS?)
-		append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	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
-	qt5_symlink_binary_to_path qmake 5
-
-	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.4-r3.ebuild b/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
deleted file mode 100644
index a3855efd1db1..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.4-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=3
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong 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}"
-
-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.15.3-pthread.patch # bug 803470
-)
-
-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
-
-	# Broken with FORTIFY_SOURCE=3
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	# Refs:
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-	# https://bugreports.qt.io/browse/QTBUG-103782
-	# bug #847145
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		# (Qt doesn't seem to respect CPPFLAGS?)
-		append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	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
-	qt5_symlink_binary_to_path qmake 5
-
-	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.5-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
index c2235698ecbf..80b1d1cbcbf4 100644
--- a/dev-qt/qtcore/qtcore-5.15.5-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.5-r1.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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtcore/qtcore-5.15.5.ebuild b/dev-qt/qtcore/qtcore-5.15.5.ebuild
deleted file mode 100644
index 5ae91ec69b8c..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit linux-info flag-o-matic qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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}"
-
-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
-)
-
-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
-
-	# Broken with FORTIFY_SOURCE=3
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	# Refs:
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105078
-	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105709
-	# https://bugreports.qt.io/browse/QTBUG-103782
-	# bug #847145
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		# (Qt doesn't seem to respect CPPFLAGS?)
-		append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	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
-	qt5_symlink_binary_to_path qmake 5
-
-	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/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 127684cf6f40..6b964bde4ace 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,3 @@
-DIST qtdatavis3d-everywhere-opensource-src-5.15.4.tar.xz 5193192 BLAKE2B 1e48b446f7858f956e8d1c407466d878203abd5651a8921d2847b49090f9e237118d22329cffe19dd331d6f733827c4d860a44b6345f94ef45311037a43b775a SHA512 044cdee342ef4d9beb62b910cee59f9cb362c85d517e19a1c0327dfa2b518b2fa484e36756ee9302fb043cc506340b501202861a858d374a5f69cbcddec18301
 DIST qtdatavis3d-everywhere-opensource-src-5.15.5.tar.xz 5193068 BLAKE2B 43f71b2d04e6fe8340c46dfccc44c7e28baf95f9d977efc3be1fd429b39952a34394c2942203c74fd1e090048e63082c5ca2d88f862cbd2581fc774f075e88c3 SHA512 dbea0c7197765b5eb082bd0d4f911d1465961ff2eba73f304c9934649e68e9a5c6c4948a305b94d5dea586490a633e335c47ef6b44e74ce9b1d136b700c94664
-EBUILD qtdatavis3d-5.15.4.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
-EBUILD qtdatavis3d-5.15.5.ebuild 665 BLAKE2B 7f22d3306d72a63d1bc0a68e87946410a27df2496f97c346aa0d8c4eecfacbdc7295f3c1c79df80f1c8d8c65da80c64461e9c152bc1b2d89b0e0478571b4b5b2 SHA512 b73b5a2a0951d73371c6d3c3f2cdbff030d73cde2f868a573780d1a899c12d52d5e71456489ec85689f8949ea774874bf045b86172236180007d2e9c0716ecb8
+EBUILD qtdatavis3d-5.15.5.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
deleted file mode 100644
index 4ac3606b0fd2..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.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
-
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 x86"
-fi
-
-IUSE="gles2-only qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.5.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.5.ebuild
index a8546f72a259..4ac3606b0fd2 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.5.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index c075a7044b55..0e7014ab0daf 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtdbus-5.15.4.ebuild 717 BLAKE2B 180641b51d75ddeaf646e6b690859dbf7078cda7b0530a06bedeca8169fa604df86933f2fcc2a65ed5a7cc7ee37ca84ed7fec14cddf0501bf018cb4c26438c8d SHA512 8b8b6afe4744513483d865259b86a8c2d634da25c043a3c47e68a5d1485bab43f74356ef1edefb21eeb97db31c4caf01a6b48a69d0907a5dfee184406dbe0863
-EBUILD qtdbus-5.15.5.ebuild 723 BLAKE2B 6264eed241e02efd9cc0abeab38da69eab271074d14bd29fbb694e7ef3c1ca454c712e39950e7003491228b28e742e6a2c3d7192b66ef991d0b7e91e829dbbfa SHA512 42e431d7078884745746f68e01bffc840d38dc8d026a1cdbb54613c8aa27f0f40072a8848460798d0d5d990203f85680ab9bd1283fde710da32f579c1bb0bc5c
+EBUILD qtdbus-5.15.5.ebuild 717 BLAKE2B 180641b51d75ddeaf646e6b690859dbf7078cda7b0530a06bedeca8169fa604df86933f2fcc2a65ed5a7cc7ee37ca84ed7fec14cddf0501bf018cb4c26438c8d SHA512 8b8b6afe4744513483d865259b86a8c2d634da25c043a3c47e68a5d1485bab43f74356ef1edefb21eeb97db31c4caf01a6b48a69d0907a5dfee184406dbe0863
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.4.ebuild b/dev-qt/qtdbus/qtdbus-5.15.4.ebuild
deleted file mode 100644
index c9058e18b5af..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	sys-apps/dbus
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.15.5.ebuild b/dev-qt/qtdbus/qtdbus-5.15.5.ebuild
index 5bddcf13d11f..c9058e18b5af 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.5.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 30d439065035..71fdd591d506 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,10 +1,5 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-DIST qtdeclarative-5.15.4-gentoo-kde-1.tar.xz 17224 BLAKE2B 296db0b36c0fc560eb262133289fd845b5f7ebfc52efe71f9d8b08ddf8b3f470e599fa8876fb3efa60664526103d5c4b38a418b381f571895e433bc2f91676a7 SHA512 f99928400628e0d74f89cd68f315eee7e5bc886e9949c5a910887d60a288b77375a64de5d40e601f0fc304f67aa32f5336caef0e0597564919e6b945df2bddab
-DIST qtdeclarative-5.15.4-gentoo-kde-2.tar.xz 22504 BLAKE2B 2e04de1a4f69e3ac89a2f420b374fa65ee6741a5df966a4cc7de40d9ff4b134231568b1c39c1bb1f1cfa0fad1b09967de816b88b84c1d8a7a8a58d1824c632bd SHA512 183b11738202917c1270af69dbcf9e417b4c9033c8b3555cddf3515eb1d3f0440ed4735766423115c7642a47e9109081a62cdf3834c221b4b9c61b589c6180fd
 DIST qtdeclarative-5.15.5-gentoo-kde-1.tar.xz 21772 BLAKE2B 83a19f79355102da7c3bb705a85fd6d9cfe7b0906a60664c56ca43e47ede33dffc0655ea71c79aeb60048e8c7810ae4279a6a0f491ff8a687743fe715a7ee033 SHA512 6a8e979f3673373bfae29d30b909f8d4034e64206ef5b09e34e2168421ad8c0d58972d1fe446ee61d8dcb2e27dafce455885749d8f4df45abdaeb5ed66358a3c
-DIST qtdeclarative-everywhere-opensource-src-5.15.4.tar.xz 21573148 BLAKE2B 092d323c89de0f8be786cfd9dcc3bf84f51c54f3e984b3c0fac1d110a92c94f67f8ba7da43e96dbf5afe1cfb7de49f204a684ea9b189be7f412d1f61a838b121 SHA512 8a4ff61238fde7cc563f9d94b5d1f4fd71ecb95ace447e57d08f71da82400b37c42f4f1ecdcd561116bffa1ed483219e06fb550f91c90842e5a43487bc4706b6
 DIST qtdeclarative-everywhere-opensource-src-5.15.5.tar.xz 21581628 BLAKE2B 4cd378a0e55269c9b22349c161f81653e43326e2e78ed7880f776aa787a934412bc83196fefdbc09250db283aff883668eb29fab326bdee4a5a966e57028b538 SHA512 b4b2754ae3566bbfa3e0162738ae6ea3b36d506841ce7e4b5651d0b0ca1c341ab19f653aebc23d13a17840d391280137c463c29fcf4866fc1f1c3adf8ebb5e5b
-EBUILD qtdeclarative-5.15.4-r1.ebuild 1497 BLAKE2B 25aa8b4bc3d8d518b30254f4490fe25953c1b26c5340ed42bed9935dd00ab673a3173743a52538a1a976fc5922cca74f3bc9889459dba976b16084d80c644eda SHA512 476eecfaefdb6eb16c55ebd769a2f1381a4c2f829116be2f4dd3787ff759846d32d559fe7f58927fe43ef2c4694e18f26e558bca323f6445b16c59f47cfacb88
-EBUILD qtdeclarative-5.15.4.ebuild 1495 BLAKE2B 4ba4f552bace5306e251bf88ea352bce81eeaf2050b82b2a83ee8df8bea63ba19507cf387a149aeead584ae2714841d45ea9207b5791c5614b7a1275ff6152ac SHA512 24d71b5eb261bf884a2ea8aa582ceca3dbf1f07a087b2c120e4ce671e9a2f784608618f4800b46c61cab052d7346c538dc9fc15e64b682954a54ea46f40d2456
-EBUILD qtdeclarative-5.15.5.ebuild 1555 BLAKE2B 22b787a12268727102b14b91a8594bc499c8f705971b201fae06ada9b7c8c6a19dda73c4ddcd4ce0e3a1473ad02d95168cc899b1b4364f713eedfd1eac57f2c2 SHA512 ed40f6c916d90df0044b0aada1be69bc61fc3232679b4386f69e7ac8574e38aec650f9ba996c45962e17a0a1eb957af7e361586abfd552043fc5e6628f0bd73f
+EBUILD qtdeclarative-5.15.5.ebuild 1549 BLAKE2B 27a4c3fd9059ca5964351063adbd6804461652ee824be3c9219c4f4212df0c96ec05f24479628b650c7255743421f713c6791df303df180da875c53fcd30a92e SHA512 3a44bb5546fc9674ad55bc80f422ad2a30393960996610cf6004ac217efbd732f74a4c7f3344f6d40730428f9c7aea235a28939d714e74db744442186240cb27
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.4-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.4-r1.ebuild
deleted file mode 100644
index 33832b597da0..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=2
-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 ~loong 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
-)
-
-src_prepare() {
-	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
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
deleted file mode 100644
index cc8049ce2c72..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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 ~loong 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
-)
-
-src_prepare() {
-	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
-		$(qt_use jit feature-qml-jit)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qml 5
-	qt5_symlink_binary_to_path qmleasing 5
-	qt5_symlink_binary_to_path qmlpreview 5
-	qt5_symlink_binary_to_path qmlscene 5
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild
index 06fc4e064066..496d3d0790c3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.5.ebuild
@@ -4,13 +4,13 @@
 EAPI=8
 
 QT5_KDEPATCHSET_REV=1
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit flag-o-matic 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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 1a3be192111a..afe001030227 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD qtdiag-5.15.4.ebuild 824 BLAKE2B d863a2f80f3b6bae95300804bd1b64e23f41eb4baba604273b374471cac8f6fe753f3320ac438d5612da6dfe5927e16a83a542dc5d06d87bbfb5d455079cc823 SHA512 5158a290301ecea0fdb98beb13b129abf8d6b15f06205a150cc05692318b1e8e7f130d3cf99ecda290f807674c01abb6a0894ded0d42ccff59792fb4e47685cc
-EBUILD qtdiag-5.15.5.ebuild 826 BLAKE2B 3eb1f7da38698335ea30c708ebb029e07862e2784c80e4fbc8afd014062805498fc1f2b9679331733e71f90f253d2cf934e104817ece249a4c52130c8009d995 SHA512 8a04ca057a997c04da493af555029bd229bcbb9ed448b3a6311541590696e5f6c3d7055ba53f4ff01ed8600a950e44921ead07e9dfd996783486905b3562a0db
+EBUILD qtdiag-5.15.5.ebuild 824 BLAKE2B d863a2f80f3b6bae95300804bd1b64e23f41eb4baba604273b374471cac8f6fe753f3320ac438d5612da6dfe5927e16a83a542dc5d06d87bbfb5d455079cc823 SHA512 5158a290301ecea0fdb98beb13b129abf8d6b15f06205a150cc05692318b1e8e7f130d3cf99ecda290f807674c01abb6a0894ded0d42ccff59792fb4e47685cc
 MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa
diff --git a/dev-qt/qtdiag/qtdiag-5.15.4.ebuild b/dev-qt/qtdiag/qtdiag-5.15.4.ebuild
deleted file mode 100644
index 4f524afa8dfd..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.15.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=
-	network? ( =dev-qt/qtnetwork-${QT5_PV}*[ssl] )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qtdiag 5
-}
diff --git a/dev-qt/qtdiag/qtdiag-5.15.5.ebuild b/dev-qt/qtdiag/qtdiag-5.15.5.ebuild
index 29438215747e..4f524afa8dfd 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.5.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="+network +widgets"
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 3b79d9fe673f..d8048149ef01 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,5 +1,3 @@
-DIST qtgamepad-everywhere-opensource-src-5.15.4.tar.xz 388656 BLAKE2B a061f95d4401b058fe66437e71394e3635c8d23e0fa686c3732979e1f1773bd02d2f7a65b6a08f91350d0e870e7653d9acd1069ef34a27e0fe81fcaee41915a7 SHA512 37eaad5338b6c5114571c6983fb806ff6537ba7d3dc4bf8d02899e693198a22ce17b0b3ddf2aa52447fcebb0ef97a3baa8e1bc3a7e3f265ad047509f53160ee9
 DIST qtgamepad-everywhere-opensource-src-5.15.5.tar.xz 388708 BLAKE2B c82aefceaab363096c0f43096b70ac18ac1cfe9c793f3d214f08b5ad3471b71485b49423a77129802d84f54f3b86618636a6edd057df1507ec31a7b5efda1343 SHA512 504a2fc4c6b764c10af1641b8e3d3c36372ebc41efe95714c7928ae2a0b1a11c3f274e7c85ad4b7b0afeb7e309e5f1237913993a7c30345fa305f6f7ea320f3b
-EBUILD qtgamepad-5.15.4.ebuild 723 BLAKE2B d7e60c8426952fb74e5a2aff6d3c540c7d48d8c7a6be20d8e0ab3e58537cc089e8a1acd973c76f66c6a9ee8e047a98bf1d7d8b94c8447feba863c60c621d2c33 SHA512 9704ffd0c87d89e81f3b4cf57c1a80454865498118423822e5d62391547475d9cdf7adf2dda6edc4ac6916d4d071e1fb4f53df1a26f104cef68e1399b036903d
-EBUILD qtgamepad-5.15.5.ebuild 726 BLAKE2B 5763eb2e68c28279c2aeebcb3ffb5d4000f2a35982eae01d64bd6558a24b52f643eef3fec88dab96a077a5648566776d0ef00b9358b88808700178efd1c913a4 SHA512 a6427c665f831c18d32fe9aea348b058fb4571bed4aecefcf27d376ef8ae7162cc48d7e362caa1ec243e5aef4c1fec1b0121e5b2e373cc84afdafdc279abddb8
+EBUILD qtgamepad-5.15.5.ebuild 723 BLAKE2B d7e60c8426952fb74e5a2aff6d3c540c7d48d8c7a6be20d8e0ab3e58537cc089e8a1acd973c76f66c6a9ee8e047a98bf1d7d8b94c8447feba863c60c621d2c33 SHA512 9704ffd0c87d89e81f3b4cf57c1a80454865498118423822e5d62391547475d9cdf7adf2dda6edc4ac6916d4d071e1fb4f53df1a26f104cef68e1399b036903d
 MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
deleted file mode 100644
index eaf359db97b6..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.15.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module to support gamepad hardware"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-IUSE="evdev qml sdl"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[evdev?]
-	evdev? ( virtual/libudev:= )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-	sdl? ( media-libs/libsdl2 )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt_use_disable_config evdev evdev \
-		src/plugins/gamepads/gamepads.pro
-
-	qt_use_disable_config sdl sdl2 \
-		src/plugins/gamepads/gamepads.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.5.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.5.ebuild
index 23b8279f774e..eaf359db97b6 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.5.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt module to support gamepad hardware"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 IUSE="evdev qml sdl"
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 3b348cc6a6bb..4c16418929ad 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,3 @@
-DIST qtgraphicaleffects-everywhere-opensource-src-5.15.4.tar.xz 14043408 BLAKE2B 9e0eabcad7af03635b72433f19087e76dad85d63637de28afa97bfd4927bc8b811f42d0dcf9ea3553f9d6560e95fa82ef98334f8de9b78f5c4c0febdf219a99a SHA512 00cf02057dfc1624c84079e1a08a65ceb6fb7df712f05ac9cb0006de0add9241e56a8e3909eeb04d1f6a90d5032909a41d59341e002750ab99d2449f635e64e3
 DIST qtgraphicaleffects-everywhere-opensource-src-5.15.5.tar.xz 14043788 BLAKE2B 998b53b32215b4f65f3e3a7e6fdb013d7fb00702cac3fdabfa4949910a8a0d5352aba273d272686c44f1be207e687ef9390157e5d405d421d3f4ea418154d2bd SHA512 322caf42ba1be86d8872f9c86184a2b8a3bfe566c1de2492f3e22b73435fb18e0618b48f738a8edf4a1ea0ea5f6bd99862a8611c0fea97f54849bcfcbc570af7
-EBUILD qtgraphicaleffects-5.15.4.ebuild 466 BLAKE2B ababa1fc6f7c5e8dd0f2eacc44372cee8c6c9483a5b8ec21ce5950a14b4bb280491f84e7f168845b1c5fc658482190a4101db30a020781796279b953f30eb53a SHA512 45f3c2d3994678545da37a6d9fb852ee1d1f123d9c409d22aa1e517bf8e27a9c8fa85f94ed20a5361decb8f83d0a5eacccc496d660deca05412a96aaac6fd33e
-EBUILD qtgraphicaleffects-5.15.5.ebuild 478 BLAKE2B 424e6790c604f86767b45da694eff676d403e6d9084637a6cd79457fe973aa9785bd0cfbba49545c2e7ac80c4042ef02954159d701000b306d1a35497c06dfc6 SHA512 31ceba6044f91f154d2f8093600524fe0e93ba839898a42def96a76468c80ffee219800f860ebb6f127efef34211c4703bf0c33aa8729b3e1c338e04564d254d
+EBUILD qtgraphicaleffects-5.15.5.ebuild 473 BLAKE2B 14aa2cf1c4ea3f411576fc7c6063ea12833910408d433a5ba86086bf2a323a7644fec6742ac6c9d529bb9a9dee96ebda4e16953193ff29a63e8bafe66c1b481b SHA512 143efcda92eeae569e2a9e944cc537b7f33f9a2ef3f5daee6f7f80c90c4ffc81cd42b51e8a8c16c42f6a452de7dac156ed042f1f6d0034face231a4d0bd1ced4
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
deleted file mode 100644
index b338f84aa1b9..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.5.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.5.ebuild
index 9f6cff6e88d4..e0a0261886fb 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.5.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index ca89c60a1f7d..7102c340c79f 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,11 +1,5 @@
-AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
-DIST qtbase-5.15.4-gentoo-kde-4.tar.xz 569140 BLAKE2B e33a39cc409a6378febec4b675f3473bde939c42235d7b9ffd671221745c05d9d8db427f5ceab9b856f84e293f09bea7c327649a4578f44344e56e978b414942 SHA512 cf67a9654c833910cd4f25d4b742f4750a90e10c682b93e9fdd905590b6c6eb5dd53d0d56d0700b022a3dc85d9202e2971391cfd9158713a12971107a56a0e62
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtgui-5.15.4-r2.ebuild 3961 BLAKE2B 8ad509f00a65063b1899897054485389f6122f76f53ff995b58de77ca2cad7381647e1750aedf488d500910e1cf8a0f89da73bf284a1f6de9c338e1fd12e2e8f SHA512 3b83c1f01fd768e6b85f535adf77c92f5a12c06cc736797c975233473c767bd7b63ebaa68c683a486d917d9629036cf61a298d1e234e3e77cfb77c48cf1292c0
-EBUILD qtgui-5.15.4.ebuild 3959 BLAKE2B eb2275b81697aec0a7b4bb75333b02548a70447e158a52069acbeabaf2a22cdd90257a30a881595a339e3cfc7ea3d1e6058864be97c7bf1bed5d044c5729880b SHA512 13d1f50be43ea5c6370e9fd3cc0f59cc0a50b0c31b52cbbf380d0cb52fd0dccf1d85de5fa2127c6e1a0eb7dd67ac26c6b6a451fcb2c7b2d71a2288afc4a77601
-EBUILD qtgui-5.15.5.ebuild 3901 BLAKE2B b4aac50158174e7e2c3bdfc00e25009e7386e1a54d617c0533beb28a19c24b5a105cf3ad8e54179a63be74c786ad97bcbfec72f84ce2bd9db838081bc6bd39a6 SHA512 70b2d30a9fc02e6572a0341189e3b4eb082b964dce25f75e26de7388c08c64f58b977e9c4559fbf1733a5f6ed11592e9e7de53d709fd5357734dad0023936141
+EBUILD qtgui-5.15.5.ebuild 3895 BLAKE2B 44c8de506dfd6172926579f0ddeb182c7b496b8c26880cdb5875622cad8f3079b647c43a32cbf5de8af8843f6ed9655125083e499ee486fd38414cd5ff563b85 SHA512 a461ec66e91256c2bf491e596b31d1a81a899c2ae186309537b5e74a59efd8e6a1a6a3650c403122abbc4b2b997a9ecc8b605a54b0c004ccd40404521f7ca9e7
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
deleted file mode 100644
index 41814c061a46..000000000000
--- a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 Mar 2019 21:37:52 -0500
-Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2
-
-Resolves a build failure when QMAKE_CXXFLAGS contains -march=native
-and the compiler is running on a CPU which does not support AVX2.
-
-Bug: https://bugs.gentoo.org/672946
----
- mkspecs/common/gcc-base.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
-index c2669e4833..44aa96af38 100644
---- a/mkspecs/common/gcc-base.conf
-+++ b/mkspecs/common/gcc-base.conf
-@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP  += -mdsp
- QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
- 
- # -march=haswell is supported as of GCC 4.9 and Clang 3.6
--QMAKE_CFLAGS_ARCH_HASWELL           = -march=core-avx2
-+QMAKE_CFLAGS_ARCH_HASWELL           = -mavx2
- 
- # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code
- QMAKE_AR_LTCG           = gcc-ar cqs
--- 
-2.21.0.rc1
-
diff --git a/dev-qt/qtgui/qtgui-5.15.4-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.4-r2.ebuild
deleted file mode 100644
index 7d3c9b130f13..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.4-r2.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=4
-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 ~loong 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? ( media-libs/libjpeg-turbo:= )
-	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
-)
-
-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.4.ebuild b/dev-qt/qtgui/qtgui-5.15.4.ebuild
deleted file mode 100644
index 97dfcd55689f..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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 ~loong 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? ( media-libs/libjpeg-turbo:= )
-	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
-)
-
-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.5.ebuild b/dev-qt/qtgui/qtgui-5.15.5.ebuild
index e41c1be0e97a..60247e762be8 100644
--- a/dev-qt/qtgui/qtgui-5.15.5.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.5.ebuild
@@ -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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 775b4e0788a6..23d992713bbc 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,6 +1,4 @@
 AUX qthelp-5.15.4-bogusdep.patch 779 BLAKE2B 1d939de92a719cc26b154ae6522ea12b304e3e0499125164e12eefa137df878eda56f0ee81b2448f0f4dee7a80468e616580e93c698c8f1847bc0296a63476bb SHA512 1b4a6f02f35ef038fa61a8cbc218fc758c34bc249f5a2da59f46209cc39c0e886bbd95a0b430588c49185eeeeaae70aafe58317a396a2455655fd073aff8626b
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD qthelp-5.15.4.ebuild 727 BLAKE2B a7cce96f7d87b713b69fc3f5624bf1f742113a88a66fd74cef76f1c3c9b700813f8c2fa9e9c081e7ad4332b0f77de3d21214cd80beb8b600d5ee4cb336106434 SHA512 b383bf2534a9ec1ebea17b13b269eeca40523de913a989e09628fc27f88317da5f6c6edda28254086583390aa3b72f67e1cc025d8ba6c303932711f60084cf4d
-EBUILD qthelp-5.15.5.ebuild 733 BLAKE2B 0a0734d541ec282299cfc3b22251ca105a2f01dea756d52ce5d8cc2c7dabf51c3b7941319c0d5f9172a3e53514e2f6b7e5abff94c8fd2d2d35b385db92731f11 SHA512 600eca9188462802b7cd92d752622bef5695915d127daac85e030d432dbeb097764ed27b70b9c50cfb6ba052e1c9ed74f723ec2587ec931b1e7c92e6c0694d88
+EBUILD qthelp-5.15.5.ebuild 727 BLAKE2B a7cce96f7d87b713b69fc3f5624bf1f742113a88a66fd74cef76f1c3c9b700813f8c2fa9e9c081e7ad4332b0f77de3d21214cd80beb8b600d5ee4cb336106434 SHA512 b383bf2534a9ec1ebea17b13b269eeca40523de913a989e09628fc27f88317da5f6c6edda28254086583390aa3b72f67e1cc025d8ba6c303932711f60084cf4d
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/qthelp-5.15.4.ebuild b/dev-qt/qthelp/qthelp-5.15.4.ebuild
deleted file mode 100644
index 7db1ae3ebada..000000000000
--- a/dev-qt/qthelp/qthelp-5.15.4.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
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtsql-${QT5_PV}*[sqlite]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
-
-# https://invent.kde.org/qt/qt/qttools/-/merge_requests/2
-PATCHES=( "${FILESDIR}/${PN}-5.15.4-bogusdep.patch" )
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qthelp/qthelp-5.15.5.ebuild b/dev-qt/qthelp/qthelp-5.15.5.ebuild
index c4a559956981..7db1ae3ebada 100644
--- a/dev-qt/qthelp/qthelp-5.15.5.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 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/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index 62e20efadaf8..0b21d3cdd7da 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,9 +1,4 @@
-DIST qtimageformats-5.15.4-gentoo-kde-1.tar.xz 1588 BLAKE2B f73941b56aad237eda0a4bd34979c8b32ec4c76511cb4f2850ba47fdf5a06bea180e155256f2e7bd5591d4fc0b84b5a2bffb8f326e75bb1c5d0a3ab7d874cd4a SHA512 f4a6dde562dea96f0c6db2e859f3e4566f842d887908eb389ace0aeb0c60b02a65b4c14030b05039322745d4140e979240ef2bd2dcf6c0284c44d6fa4e51686e
-DIST qtimageformats-5.15.4-gentoo-kde-2.tar.xz 2032 BLAKE2B 7953a793fa24815a2f602e9472a664eff159497ac4bd2e01c356a015b7d0b5d92d83606ddec5396b2bb2c893ee20f0f8c5d2c5820a522f1c0e20bd94deeed500 SHA512 e9b6886ac33f9bca09fdef4de2fc28fedcea9d168d8a8c0f708c20d4cf14bc58cc583edca85e1a04e596a2a4ebcb98520ad1fc196ce6113d446a184d8def285d
 DIST qtimageformats-5.15.5-gentoo-kde-2.tar.xz 2596 BLAKE2B c09bea5234b433d33f6307fbdf93f1ccd6b2b848dc34891afa17599028c2ec2d9b5dd3a1c3dcd0dd6ffff01bbbaaf350a6c17440e9083c05ea91ec3b31a02f7a SHA512 df30c604f167cda8e819af7461b11386701e3ea7357244d5525e1fa3c7a6391c21736acb1576b913b8965ff4e90ebf0b85f2e9bae419da0ac2bc8d9f5d423b18
-DIST qtimageformats-everywhere-opensource-src-5.15.4.tar.xz 1830288 BLAKE2B 7eebd51fe37d7fb33b78bb176a15cd943f0350307774f62c2a6635f5a603578819201402dd065f99dd01546c4d8d1e5e2fedaafa822656f7c5aa894a60dd17ca SHA512 388a9ceebdca6d32f606615af37233f2d8394856d067c9a80486b88ad5714eac90263cd6555a3efd9c1b5fdcc27431b7f99eed6fc02760b1a9974515bfe70274
 DIST qtimageformats-everywhere-opensource-src-5.15.5.tar.xz 1829872 BLAKE2B 7b240291e6076537daa9bc3b87f13f3285f19a4638de5b5db44a2b55275fbe843dc974226e999cd90e6bf902b43fbcd25f052619f291fa36807830a26c10cd52 SHA512 50a68bbe83fac710f21f05f3c0637beff17de00f9309aab2ceb27cfe7a178a1a56b0906f357584eef3188d7b89504591c924a9d4988a7321fb18a72271bb2dfd
-EBUILD qtimageformats-5.15.4-r1.ebuild 711 BLAKE2B 09d0ea02ad3ceffa9b09fdea4d682218fa8e8975a9858b408b7b37f141ad81250930385e83a2e1bcb29fdbd2cf83277751a0b50db0e2dbc2be3f2d78a7a5996d SHA512 8b5848b0d24e24f46ee39e3630c84550ef3b7df334f994fcf5e007af64e7399c12ad6ea8b5f07532d0776d05313f9dcdb724751b5f4147ca0daea5f30b2e54f5
-EBUILD qtimageformats-5.15.4.ebuild 710 BLAKE2B 32b729f69297b495f2c364d26073340aed0fa2c8546d7e37977e81e6fe90a3200bddbf7d6c2c9cc199351f56e11babef851e57c7829db4a7a08bdf2af1ec95c0 SHA512 daa59e75e21674c0467a21b6ce95c6678c6f010ea55987d95282456eee4046c2a36c1dd21c861d50f79a1e2747dbe999c1dad43ab54288e5685348edc23a8abd
-EBUILD qtimageformats-5.15.5-r1.ebuild 714 BLAKE2B 1ff165bdf11e87d98fc1ff4c65cecebe1b96c6d4d3c6a0919f5bfdf9fce24ab828c05292c7d262e0d0c7a592d916562edf83bfb9ebe12ef6e0b5d24c0a9814dc SHA512 18e33ffa32485d256191449450c65b5d580950082673f208e9f6135acf5fdc23a5640f6dedda69ddb0dfd86c733b4ea50cf04a2429f606fe56052ae873a29e34
+EBUILD qtimageformats-5.15.5-r1.ebuild 710 BLAKE2B bca14a1badda00a13e852dbe4e70168179a73ebcdf1e7a3799fb0da55fb0b4960460975090bcc46fd4e0e96c64595755cb38eccb0196d9f0c1c61bb70b96c4c0 SHA512 1ed641faed82574aeffec083593138b591d98fef813792695ea22a3fd9fad54488a3cf1efcc6fc52d022b66d153c683a4c4d19c32e5512b83faffd1a2fc73370
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.4-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.4-r1.ebuild
deleted file mode 100644
index 308031f04fd3..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.4-r1.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
-
-QT5_KDEPATCHSET_REV=2
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.4.ebuild
deleted file mode 100644
index 225d841d11cf..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.4.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
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild
index c6cee7fd360c..d3291db75635 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 353ed388edaa..a897ba18bae0 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,4 @@
-DIST qtlocation-5.15.4-gentoo-kde-1.tar.xz 1000 BLAKE2B d50546826373a9123f91d2e21f670c030a4a9530494c4ab173a4045f79ea7c6907e39c0acb57e7e3e872146ad72785c4b72b7257672e432ff5870730f66a54cc SHA512 5d2217a3d40b873cd6b0b7c7815a9a52aa19824b7c2aed1d1ea3dac2fafa8b2af9a62ff3dacbdcb588072f2edb1cb226bc808d094ca4c6240a58835d4e93854c
 DIST qtlocation-5.15.5-gentoo-kde-1.tar.xz 3952 BLAKE2B ddab14fa3b17d080ea47a6bc10c3ca8fe180ff4954f22833967d1938f06c657c86c2e186e5c6bb50e3fd65c6c0c0b5cc94527bd687b714a315f23dcb7762c606 SHA512 f20b5aea6d68ab6860d69369d58b777ff56de3e2d93e3cbdadd21e6e0fb3511829d5c28b918c19e10290c1e5add0d087f98b2b005ac2f9a5381b9d59fd626a59
-DIST qtlocation-everywhere-opensource-src-5.15.4.tar.xz 6559260 BLAKE2B ea43ae7e788f7d117fea9db50660cc2f4e7b6f8cf4ae390b41ed3adfa794d66596d8d7ac184d1edc432d2aa6057727321459a29ddbe399201ad428d290982297 SHA512 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3
 DIST qtlocation-everywhere-opensource-src-5.15.5.tar.xz 6559912 BLAKE2B 4f546293b2cfddf5512f3648aef9c527762d6c6ddbaca6583cf0287178524bae9f84e4b94950ce1139042efa995a4f31ef20f26b8d5479048df2ba75cac35d23 SHA512 5090f68926a7bc2f25ea5ae259cb87653b83fcf337c3255a7a2700724f6ac83ec2e1d9b6f38f185ab7dab84e5e042b72c58f4e4cacada6fb7d729378b93d9b3e
-EBUILD qtlocation-5.15.4.ebuild 1152 BLAKE2B 94668b0c9701804380400a3dd605cbdee83cf1bb23507d359b0fe24042a433091f41d36f55c5b78867fc4b134d68e1670982995c11835e33210d75f0ca5c3a7e SHA512 27e9b6a171f0dd8819549a7f69fa87282b23a3bf0f8e3e73629d1e580aa9992ddf64831e9d62ebb627e0fbc1d5c44044fd9ca168e7edd6578e9b078b5788cc15
-EBUILD qtlocation-5.15.5.ebuild 1163 BLAKE2B cb4ee099401a8bf0c4b7a1e51c7e605d709672536add0e5f7b71b99f725184f1dd1562370a647f730c588d3711e4058fd6735116ee5eb2e85fbe0274fe2aac8a SHA512 441abc5fbcb9ae879122725959685b6b8921ef0718324c3c70d59b03da5dc7588b06295dc00f590900ca11ada9562d4e508c3e2738f37d1ce1e2dd9cbc5e1576
+EBUILD qtlocation-5.15.5.ebuild 1159 BLAKE2B 4944615c6063a3bad6dd5d328cb7ede5779a2d993b5d63fda94bafc0238f8425c5c8c13d95608cda4da01fce96bb11bc2d78319b33d4f500f0c08c9562ee0d4f SHA512 da1722d56144bf6dfe6f90ba9e4642e4dd19a40d7f3fabdb6020a72eee505edc490554d07a2931abc59bf62d74986f1539b348e82e7a152245dd67d94b0bf430
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.4.ebuild b/dev-qt/qtlocation/qtlocation-5.15.4.ebuild
deleted file mode 100644
index 92e5cfbab96f..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~riscv x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtpositioning-${QT5_PV}*[qml]
-	=dev-qt/qtsql-${QT5_PV}*
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	=dev-qt/qtconcurrent-${QT5_PV}*
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/imports/locationlabs
-	src/plugins/geoservices
-)
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp "${S}"/src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/qtlocation-5.15.5.ebuild b/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
index 89ca4935539a..0e27ef20621e 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) 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=""
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 7b61fb11815d..155479c5fb0e 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,8 +1,5 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
-DIST qtmultimedia-5.15.4-gentoo-kde-1.tar.xz 1324 BLAKE2B 8080e8f35ae0dab394bac10b9e4db8ff1afdd98cd91cd0a513873bf78b675a69af908e7a6c1adc7a9f75176a3a1901d66c15ca56c7c631bcf69318c3ba0e235c SHA512 414874aedfeaa1abc2da4440c404cd26364de5de060b8c148d7883122abe82d47bc8c013ca5fcf9f6c0d8cd98d686ebcd100da6b945bcd530a5511c376cd2051
 DIST qtmultimedia-5.15.5-gentoo-kde-1.tar.xz 1324 BLAKE2B d29d8102e6fd55f2c2f6037e292a3c4039c7532fb63c34cc19fbedc8cf3f8082c6d75debd1617a5d29fcdf5b8c7a7fef35f103c9179f980986b646dae9ff867b SHA512 7b37f0db1de002f2cbaad6852edcf772dd0220f81d9dd836b3c1266df7eb49ec40d3eba6d3ccaf68f621c8e93b2812e2d882291fb2f07d0b80e4c9975a408cdc
-DIST qtmultimedia-everywhere-opensource-src-5.15.4.tar.xz 3833720 BLAKE2B bd381125280527eee7b5cec117c3d4c64ce2000b459effc1d912e5209d57bd88baf547967d61eefc94adf3f8aa85e3caf010b7ca9f7551b29182a90f483c5cfd SHA512 bb0ada7560093b89751b5b3c0e1a573de215a388d621d356bc3c0e1acfffc2d696230c67b7a7cef037b18c4da900c7eb3d315bd2e73ce12f9aedd0e340399117
 DIST qtmultimedia-everywhere-opensource-src-5.15.5.tar.xz 3832656 BLAKE2B 6098fe14344ed03dbfcbb2db429c431a47282bbbb89602742be2fe44ef063ceb98322bb576eeb559a649b24f142cd5e21b652fed8c96814b8e3b8b0a66b51fe9 SHA512 f798ffe0a32bc9f16f584b7a322c321dc2ef62c18395987ffce1f7f6cac10722c6f1166c64a1fda9877f3970a8e7b3ef8b7d9763af4c59ff313adc6081a7acfb
-EBUILD qtmultimedia-5.15.4-r1.ebuild 1577 BLAKE2B be0f10a67c8d5e0f39e57fd5f7a30e8d5a8a8dec4d94d9acd5a075029b9127ecf5ef9ad55ee9f94f3891f7d3a637d0fdfca6ba32c90f3f3fa5bf3d4d166d7376 SHA512 2ec8c3bb2a292d8db930568a24dfc4fca5ff8bc34672a647cfd9ef15f9f15b38c6edfdf11380ba59de27334e8bda689202d727b40fa53f72976bbc8ad4e4b879
-EBUILD qtmultimedia-5.15.5.ebuild 1590 BLAKE2B 5e6e6689fbc7c925fb56ad7aada609ea9b8feb19b69025dc079af010f80548c1c6f68fd224764d8209c686fb49fa65ccc7e9da02f2d2cc5ab20f11ddb7bcbbc5 SHA512 d28fa3db668122ce80ed5e1b74ff252ddf1e30f0c435f2945e4b534027d9fac1c19149ffe826a827acbca9e3b13be12a350c5f2b0797545a6f80db6eaa60fe8c
+EBUILD qtmultimedia-5.15.5.ebuild 1584 BLAKE2B 7c9c712c7884c5e90dcb1ead0303b86cae19c300f982d11c44c10d7bf8511613ad694af8c9e792693388390942751908ab29e387b5777388aa0444eb934368b9 SHA512 7f3cde3b314513d3c77f976f878e0c6bbdd70ef064afdc7a31e270c8f757fb2b89973676042cfebeff71e3f853bcfea08d0305ab816864a85b0cc246651aca38
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
deleted file mode 100644
index f8eadeea4dfd..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	qml? (
-		=dev-qt/qtdeclarative-${QT5_PV}*
-		gles2-only? ( =dev-qt/qtgui-${QT5_PV}*[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-		media-libs/libglvnd
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.15.2-no-qtopengl.patch" )
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild
index 19cb65492dab..6e4796adca29 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index b6dea16fa008..e4ea32eb4630 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtnetwork-5.15.4.ebuild 1613 BLAKE2B 9c42d7592f129363489ec90b42b9dc27f74042fc78afc4d1467f9876d4f3ab2769b44afa4ffe33188dfe82cfa2adabb8c9c0507b9025e943f81cdc68bd6f2ac9 SHA512 b95ed8d91aec0d323995d51cee6d804be8f0a153bf774a1d59ebe96d887e5056b22b8bd963532edda3fe0e0863a826e340657897fcac1ffc666cb168ef8745f0
-EBUILD qtnetwork-5.15.5.ebuild 1619 BLAKE2B fb05eeb00bf320662476f7cd1714ff6e485f2b134d58c2b11de775a23be5879221fe38f2218e4cd19a0b1186ac82d866954f11bcbd7a613f19779e94303e7717 SHA512 217ad8408739a7709e347fc7ef5fbce855790d510cf70ebc6efad4998ed0e7207dbb0b9c5bdb983d704fe2d28b7f5995f8b4c1ff81193fbb782f72ccd6fbdb68
+EBUILD qtnetwork-5.15.5.ebuild 1613 BLAKE2B 9c42d7592f129363489ec90b42b9dc27f74042fc78afc4d1467f9876d4f3ab2769b44afa4ffe33188dfe82cfa2adabb8c9c0507b9025e943f81cdc68bd6f2ac9 SHA512 b95ed8d91aec0d323995d51cee6d804be8f0a153bf774a1d59ebe96d887e5056b22b8bd963532edda3fe0e0863a826e340657897fcac1ffc666cb168ef8745f0
 MISC metadata.xml 877 BLAKE2B eefc4aa477bcc6ffb2a2fb0711861a9bd7c79af5c5febe0205da57a3fae7206f3ae96dffb8b57e15dfe2f1e26891691886e02984654556d3d53a269dde5ce757 SHA512 dad0239dceb378c1ad4f52c287fb5d61cc248ac533a3df3673b30c0f332eb5cd3a34255052afe2a42084bf1c1d6a1ee501723e43eb268ab5e215fb37f90bcf36
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
deleted file mode 100644
index 1ef3df50d9db..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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 ~loong 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.5.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild
index aa0e2e072585..1ef3df50d9db 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index baf2f34c96f3..33ec8be5d7fa 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,3 @@
-DIST qtnetworkauth-everywhere-opensource-src-5.15.4.tar.xz 143472 BLAKE2B 661e2e704a4e58697c509b0feced0c27d2dd0b1419cbf128c64683afc6a462763c89f43c51a4e152bd909810b9771381409f8026d7b4365295e713abc85a5db2 SHA512 a36ce21151cb98bcbc99a819e873ef10f68d988aebfbae9aaaa7dc85bd4a693ad7510c47627f0f3841c5ef50173b21cdebe6a602fa429839fd9ad9bcc02d6c3c
 DIST qtnetworkauth-everywhere-opensource-src-5.15.5.tar.xz 143584 BLAKE2B f3f6342b5d997d6fe6ff42640f808cced26acbe35dda476a4d8aa822dd903f1362bee4d9155a642c5fba3c07cd27dc704e64b217420e3b9f3d88687718b0c6c1 SHA512 b506fc2d44af9947e4150a4a8b1797ac41889341e60d78fbb8ebd3f27d7846e6fd8e10b694df54f04b01f16aa5af36cf1ef8e0bb30f32881074fb72beb471a1d
-EBUILD qtnetworkauth-5.15.4.ebuild 402 BLAKE2B c8ca356b8863d197ec4f0a0077f28780fcbf03a22145d6cb3053f6b7739767447046ca98b89644fb5f9bba95cda67b0a2e9b9f0a1552b91d46d66d2e017d3f87 SHA512 8da9b85349bdf422963698005eb44a044cbde09fe18d6710e17967ae378c86babb43c5e4fe44b8301d187a687f413e81d7597eb9a53ef63ef594f2e2c627aa0e
-EBUILD qtnetworkauth-5.15.5.ebuild 405 BLAKE2B 58346d62e5eaa71a459e3b4c4b22d37e3585ee6078f7d72e53ba5063cb2e7b4e004907ec15de0d145df81eb157940a745e2b1b42ad5cab885b240b150170bc4f SHA512 e914af662a461c24ad1e68884f9bd47da78ebb5203663a47b6280203d11a2bcfcfb32149a475b0f7c0ed5b33f4d63448c067ed5ba26b5e32df9f787670d769dc
+EBUILD qtnetworkauth-5.15.5.ebuild 402 BLAKE2B c8ca356b8863d197ec4f0a0077f28780fcbf03a22145d6cb3053f6b7739767447046ca98b89644fb5f9bba95cda67b0a2e9b9f0a1552b91d46d66d2e017d3f87 SHA512 8da9b85349bdf422963698005eb44a044cbde09fe18d6710e17967ae378c86babb43c5e4fe44b8301d187a687f413e81d7597eb9a53ef63ef594f2e2c627aa0e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
deleted file mode 100644
index 7ead57ade6af..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Network authorization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.5.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.5.ebuild
index 3c8a5d0b22f2..7ead57ade6af 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.5.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 945bbaea93ed..8d9b343e21f1 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtopengl-5.15.4.ebuild 686 BLAKE2B c2d82b9f170fdb10a2080503bb37a7af1390de81b52d6a9701b29cc49cdbeb72d3c589ad176c2800fc7b9270a41f1d0759f9c59e904b622b7880303bccc2a2a7 SHA512 d8ef406bbd81743f529554bf34eb1cafe8a2818459c8a4e39521722eee50b37a84c5685f1aa08be5dbc5a086b9d12c633fca0da9af8bd368862dab8e566a3d84
-EBUILD qtopengl-5.15.5.ebuild 699 BLAKE2B 82f2eff4fd38c5b53b15eb7d17c839c2440da2fde23bffaf80ac8e877045874e8a8fa6bc0b22cfa0dd624fb70a6f54e74406d8bf17d76d0ed879db62d8b64cc5 SHA512 ce6b96f4f12030013a98e228e8395d45b17e6569a6b5bce389d966dea46be3b5072c37796af844853115529a34a08462eb6329945543cb99d2c5a92687ddc919
+EBUILD qtopengl-5.15.5.ebuild 693 BLAKE2B e6cf2f8ea907d8169ece01a7ff6315ec212cfbee3c1ebdc7f4a734cc05630b8f79e1d7ecf65fea4e77a7cae9c931e7f42f3474efa0cf05d0a9d2b5aa6f8b55e1 SHA512 d3255c3d379208c5ef57b42f5a3e597c2ee3b96e810dd6b81d5ecda9bfd447b33c880945918ccc556f7beedbfaa4714038a8f3676f3c81f5963fcf4e021d3860
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.4.ebuild b/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
deleted file mode 100644
index a250eecca415..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtopengl/qtopengl-5.15.5.ebuild b/dev-qt/qtopengl/qtopengl-5.15.5.ebuild
index b38abd967b2d..8d393b94267f 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.5.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.5.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 2fcb61091dab..c80e6a7e99ca 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD qtpaths-5.15.4.ebuild 501 BLAKE2B f10ce67e95173dc31fe3d66f64cfa5a477eb640c3ee8aecffcd28009edb9f323c4d534df995199b3fa5fe04df038386bfee940c6992cc46f198cbb0f2f5209fa SHA512 34be19f58e53af56fd2df7f43e843ef4d4a870fc92d2112f226473edcfdff2e061ea55f796b6719fd89ee2adcfe9a0e4253044a74a78a2a966d114f008538e7c
-EBUILD qtpaths-5.15.5.ebuild 513 BLAKE2B d22b581f4d90071eac5f1ae816ce9efeb360808b5c0dabb7bfde8b08359e96da588d39fb20feea557620dda1185c9688240e1b112a3252e37ed2e4ace4a7591e SHA512 7a9d67919834afe22813e0771cfcb5347d646ddb9d9de9cdfe6243f80c0dce7f6af6eff30e764681c34c6a04017fac7443e69c8d6e8f55d3e2fa70eeb23433a7
+EBUILD qtpaths-5.15.5.ebuild 508 BLAKE2B cd60e6dd114baaad33fe9a77832a158f9a24d19dec7f0a5e2cd9b181e290c9370f5a42c7de73faed498c4942cc921e2cfac23c44a8ce40943798e92927fc50e1 SHA512 62043f46e038e45d74f26cb1e8a8b15d51ce0f616184c6a939cd45e03e44cbe78c509c263feb7c58e1ecc9e9e49b275490d6b7e161fbdc32ccba2a46cf6002ac
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.4.ebuild b/dev-qt/qtpaths/qtpaths-5.15.4.ebuild
deleted file mode 100644
index 5886e27aa387..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.15.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qtpaths 5
-}
diff --git a/dev-qt/qtpaths/qtpaths-5.15.5.ebuild b/dev-qt/qtpaths/qtpaths-5.15.5.ebuild
index 8daabef5dc74..c9c7e6d84f1c 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.5.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 6ca85e4ccdf1..b797b7425f3e 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-opensource-src-5.15.4.tar.xz 8897256 BLAKE2B e7d8055c9b4b52b188f61c73a300275838647d95f9eb0437129482d91584bbc0705ce9360b0a8fee2775a4cfefda53bc5aae70b10ca34d1bdeb09aa19b7d13bb SHA512 26edf546a1ec7195f1ff5a9e40e430fdd0c7ebb7d86e44ed22b093426c23ff25b2c972fa520abd1064369d32609019746c2fe972a3f593c6f7539d339642f06e
 DIST qttools-everywhere-opensource-src-5.15.5.tar.xz 8898140 BLAKE2B 49b7b0db9d9ae9c6d405678eab0ec097bc160eb7787bc939aa92816cc63c5c97aef2de0c978a2a3597014878dca9466631131bc7746bd03d87229ed7edb6594c SHA512 ff5e658ec812dd36d00ad3ac7e824de708968ff1c66a73da1470b6f0cdb6853a7084f18b1bcf1614afd4c23f381d817d7eb665f8573a4e981a9b87c6e4d6fa2b
-EBUILD qtplugininfo-5.15.4.ebuild 376 BLAKE2B c1044162f7d749b66bd50f9ea38dd72ed9033b549bd2629ad434867d9f61a047d8b4bf1e31a756d0ea9321cb4df1a4a192498f04036bbb1273f7b0a16f82ee75 SHA512 a1293b16cb56541d0ecf130ab3d470ddacad4b436199a98498a43550bbbf3d8cb285da5587ebfbdef56e995d9aaacda308523be230cf09a2e82304e12269efe2
 EBUILD qtplugininfo-5.15.5.ebuild 376 BLAKE2B c1044162f7d749b66bd50f9ea38dd72ed9033b549bd2629ad434867d9f61a047d8b4bf1e31a756d0ea9321cb4df1a4a192498f04036bbb1273f7b0a16f82ee75 SHA512 a1293b16cb56541d0ecf130ab3d470ddacad4b436199a98498a43550bbbf3d8cb285da5587ebfbdef56e995d9aaacda308523be230cf09a2e82304e12269efe2
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild
deleted file mode 100644
index 7d97665f75f0..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index b0823d2b16b7..29433f90ce7f 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,3 @@
-DIST qtlocation-everywhere-opensource-src-5.15.4.tar.xz 6559260 BLAKE2B ea43ae7e788f7d117fea9db50660cc2f4e7b6f8cf4ae390b41ed3adfa794d66596d8d7ac184d1edc432d2aa6057727321459a29ddbe399201ad428d290982297 SHA512 6208052d6ac173d19dc77496d8108558e7f31696dc5792fcbbeef2029539db76a60c5a51a7d198f54ea6c0ec23977a57cd8c8f8fa80fe5eac9528d2510c3dbb3
 DIST qtlocation-everywhere-opensource-src-5.15.5.tar.xz 6559912 BLAKE2B 4f546293b2cfddf5512f3648aef9c527762d6c6ddbaca6583cf0287178524bae9f84e4b94950ce1139042efa995a4f31ef20f26b8d5479048df2ba75cac35d23 SHA512 5090f68926a7bc2f25ea5ae259cb87653b83fcf337c3255a7a2700724f6ac83ec2e1d9b6f38f185ab7dab84e5e042b72c58f4e4cacada6fb7d729378b93d9b3e
-EBUILD qtpositioning-5.15.4.ebuild 870 BLAKE2B 999d8763bcb4e6f76a7620214c7038fab89e3023baa5d887604ca93b9677e273707c85e9d07be45722e6c08e074d9c357684324200c273d5a4f270707c5b7edd SHA512 05333d0b413afdf112f2dec4a624cb04c9726fedf8c94bd35c4412185fee98c106f9f3de7d9f0e4ad0b740392972d64d76dd813c068ea45adf5513126d3ce0bc
-EBUILD qtpositioning-5.15.5.ebuild 876 BLAKE2B f00303181141e5932a72b9aaa9a47258d77e5721eeb9c0ba166170d8e3c860ac05d9b71ff50a66050c81b3fc04fad9e80f7cf16cc300f2a2597f41f8739eef25 SHA512 5151250a8d64e6cda4997213ca949bdb4d509e948c0d6d9c13b97ef98366bd606097f6bec3e1f288cef00ae2672047fa11c509ac031ec320696ca07a46c51e1d
+EBUILD qtpositioning-5.15.5.ebuild 870 BLAKE2B 999d8763bcb4e6f76a7620214c7038fab89e3023baa5d887604ca93b9677e273707c85e9d07be45722e6c08e074d9c357684324200c273d5a4f270707c5b7edd SHA512 05333d0b413afdf112f2dec4a624cb04c9726fedf8c94bd35c4412185fee98c106f9f3de7d9f0e4ad0b740392972d64d76dd813c068ea45adf5513126d3ce0bc
 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
deleted file mode 100644
index dba8769378b1..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.15.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="geoclue +qml"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	geoclue? ( =dev-qt/qtdbus-${QT5_PV}* )
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:2.0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
-	use qml && QT5_TARGET_SUBDIRS+=(
-		src/positioningquick
-		src/imports/positioning
-	)
-}
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.5.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.5.ebuild
index 88afe75e2aa5..dba8769378b1 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.5.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination 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="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index a3664fe0821d..a029821b1474 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,10 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
-DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B b7f94dd5315b9a16647c2d035fefc9021c4fcfe72a9010713ff6e47ebd1aca575778a02f96c81256fd38b6b58138a6ecd4ce046a6e4e3b0e0a4edfc64100c4f0 SHA512 f616fbd226390e8995008d22dbc35607f26eb5feaf436cd9b35d9ff0c2e428a4b75d0c91ba28660b488b03e1acccf8a2998dfdfc988335b3b37f6b6ae17106b3
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtprintsupport-5.15.4-r1.ebuild 828 BLAKE2B 867b2d84b1a1470e52b8995d3ccaff7f444d03816783bd393154e77a1d954dea473f0e7adacb8f25444e36ecf11a0e1d88f86b586504c6c09fc230b716e1a94b SHA512 99b05085978eab4606f875443a50e138076092ef38ec188e8ac4700b44b8a84b261488b0134b5314bf1d37fded41b77a974e78092f2d1e99266e302681a84229
-EBUILD qtprintsupport-5.15.4.ebuild 826 BLAKE2B 15904b05281477fadefd40f9720b8ad74cfc9c990a9390945985aa9750556bd3e41a6f7eba9b7d72656bb1ec1df75ce833945aca3a2194ef7a3c5f1228d439cf SHA512 5fad2e5a78292e52d082b31c45355de9198f2e40384ac4cc25e6bcaf692de6b542c7207186aabf6ec3fccc59c17f6116eae6443d077e919087822f4c7938b357
-EBUILD qtprintsupport-5.15.5.ebuild 839 BLAKE2B 10a53e98dad4d869d16969a0fc193c561a7f2bd6fcb2d30f706781948f26c5c697fd289f07cb719cf2a4cedf8acdf622bae8cdd150ec03f1fa623dcb912c083e SHA512 5812f909e12afaf1f8babdfdde48e0f77ed522314395750e659141bfb3f1856f96c3763d2af3280b3a03c5ce53315a78bd1847936a10d90af2573f360c2ac6f9
+EBUILD qtprintsupport-5.15.5.ebuild 833 BLAKE2B f83d54fd48a8828d6bd34815915042ef61b5070fd754582efe8fe71a3c86f6753624743c6c526e1bb61ebce8d75cac812e3691f42d33c9b99ad748d6658fce3a SHA512 ce6bec40b14228bf13ef9e6c2793cbe7f8022287d1f911dc60f5609e46093df1b0ae711a8202b6fb541ec3cc6d2172288d1ad56a7b966ffbbc61ed3c1b4b3cb7
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.4-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.4-r1.ebuild
deleted file mode 100644
index ad568beaacfa..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=3
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-	cups? ( net-print/cups )
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
deleted file mode 100644
index 16fb8af56cd9..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*[gles2-only=]
-	=dev-qt/qtwidgets-${QT5_PV}*[gles2-only=]
-	cups? ( net-print/cups )
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.5.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.5.ebuild
index 4daaad281155..f66d5accf842 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.5.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.5.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index f97bcaaf97e7..33107674625e 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,3 @@
-DIST qtquickcontrols-everywhere-opensource-src-5.15.4.tar.xz 5984236 BLAKE2B 0da3a2c3bd86a9fdb1e50627c3de51af3aa057ae76fd2492465d9eb0158384a0381f218df1f0b673934eb94d71aec33325e7fca82bf8a6466a49fb0b5518c78c SHA512 887a8f5fdcd3764575f9068ec8428526a049bb09ae0c214daef3652527d5e448baa53738dccf316b20ccf18f36951ecebd570aee3a27f9c32b9213ef7629de10
 DIST qtquickcontrols-everywhere-opensource-src-5.15.5.tar.xz 5985492 BLAKE2B 9743add71d49c62721da697c4d8f5931a3332947c2d80c5cc2abe6b24845b3ee21fe2ed54fd7d3d253cc0c28ea765b7b47ab3a3a1ced477d762370253e8c40c5 SHA512 e7d7daeb40da76b217f6460f38532b9913e766b99b42551fde82f3a9028cd5ebfcc4874a2f2b3df086e2d17907511993f49d690203d50fa8e0c9fe076d8f47ff
-EBUILD qtquickcontrols-5.15.4.ebuild 765 BLAKE2B bd853912661473ae971ee766b7898061dac95ef44774e3d9171ad2fa87b20c599a4b42cb4e0b5e9371d117d8d9dcd110a07f37756dc338c350ba85a5b4a3f74d SHA512 cc48bbc736550e64f7fdd6b24666edcc6a14d04ecbbd5b1b4a374e5859246901c7b3116eb2bccb0f016ad88209bdf61106178829d8c35aa2b6e8b2b56928e781
-EBUILD qtquickcontrols-5.15.5.ebuild 777 BLAKE2B 9e6be1954a08387ea79290a964836800568e2f821ad1d425bafbc0b824b9bcdccbcaa49c26d489d23dc912be78305ea753979effa0c8922050270e17d99ba8b3 SHA512 f6f535dfc818287feeaf6132c47f54da075c96baf1fd5d5609ebdefb60a198fad15293f6937e709a144d7d933f40d9d0b9cda1f33dd181c15a3e12965cbf580f
+EBUILD qtquickcontrols-5.15.5.ebuild 772 BLAKE2B 5a0b15247d2282a640ea0f2c73cc9ee740beae151692e52ecff63997cd8308361e810bd4507208801b1f282a9632e3d69be1c35727412c092f6e07d4a0f021cd SHA512 7a9602d5b087d94eac3cad04ea9d9f76bc7d6bdb7817684240511e9a5f1cea6912ef0197d3a511640f8c9a8afed2e562861b457ecfd2df5cd003989d338a7b82
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
deleted file mode 100644
index 992584e955a5..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc 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}"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/controls/Private/private.pri \
-		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
-		tests/auto/controls/controls.pro \
-		tests/auto/testplugin/testplugin.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.5.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.5.ebuild
index 2c770dd9dcf5..44cf0849362b 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.5.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 016039d7eaae..a221a6ff3b24 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,4 @@
-DIST qtquickcontrols2-5.15.4-gentoo-kde-1.tar.xz 5636 BLAKE2B 7a1e5b7b00b52389516d133d903543c840cadacdf95911a11218726f190dac61df4bc9d0ca885e9df2284b42238ecb45b243de136d4e403da2fcc19965372a12 SHA512 a1ee7486b7e3dd8cbfcdc72d7fc6c238edae4ce56f7319437ad75310ab25973780065ff6fd7af1b3903645ce3ce6f35c059125e4700b8840587d067bb5888195
 DIST qtquickcontrols2-5.15.5-gentoo-kde-1.tar.xz 8320 BLAKE2B 2db63308a6641f28abd3b507eebacd6765c618c5d92ec472783aa3d40a2336e9a1cb3e081b28fcdf4c4f902e3deca04660b38a0020ea3084b723a46873ddb441 SHA512 ebe58892fb120f8cb6038848a195e081996886394e106f4cb1c869b83e91194d1a20912e0b00fbbc869544eb7ea875cbced72244c945216739076c6843dd6cc1
-DIST qtquickcontrols2-everywhere-opensource-src-5.15.4.tar.xz 8289400 BLAKE2B 2976bfd78117c7db4158e828753f0ce0c39582d92f5840967c4eab9a8af61bbd023cd3d3ea3fb3dde8debd340e4e2f4b2717da73de3a2b87a9f9e15985ab87cb SHA512 4ebbb0199db156307140406b6da4fa83c47aee2105e8c46c0da96313ddc4d6d7ea2f1f85691856144eb8c5109c108bb6810ba0693a2d2411b4feaeed1ec9a8f4
 DIST qtquickcontrols2-everywhere-opensource-src-5.15.5.tar.xz 8290736 BLAKE2B 5b702a324e436cd1511197ffa88bdc0582b31d228c0197233fb1ae9df67aadc835988d44b8705fc20d1ea21ce0f718f15dc12d52da5a5f65f1b5e77e8bdf4500 SHA512 febc0dee2408e5843a670420ac368c0a01af3ea1234c7dc6d99e3d2bb447dbe063b59e0c3b943f5a6a0705d207c21d9909787f4b80acab8bef9253714ce82a5a
-EBUILD qtquickcontrols2-5.15.4.ebuild 661 BLAKE2B 92330a5576ed55bdb0952d8e74a4c4fe6c5300ac631b922af081cc018d61319ff271ced6c78e615b7766e369f249520bf094594755647c007b0f8e53adcb0807 SHA512 efce11739239ae381f2154edd0b5f37bcf4fd4dc70c2ebe7ac73247c1850e3a7518f9f65a4be2937c64b759938c838fe02fa8d007c42fcb4a263b20259a4624a
-EBUILD qtquickcontrols2-5.15.5.ebuild 781 BLAKE2B b8efac537d4a292e6682a299cd9ee5e74537d2b7ee00ae12bad46f06b88dfb665cd24aa76d3c78d5671041d68ea25aba3213205456bac7e7dbc06574a6821814 SHA512 3a8f1cbb927df9f398bc153a5dfba8d55d8108503ecb8189d2a4cd96098f4128cd3ce3f18001fce3cd459df9813ad0958ee214fa6139cde5c8f574626d2cbfba
+EBUILD qtquickcontrols2-5.15.5.ebuild 778 BLAKE2B fc5c0c4dfd291f943803b67a3d27f4666040215ff0b1d476ac2e24db07ccaa88bd9edd03a8e88526f50e1295a29b89882037658ded3c1b7f2e0c9dca1ea099c2 SHA512 82a305f7495b9bc6a4ac11e19adae7d90ad2320812ad1b7f3458c807546a7ef1e8c451927c0f6a2ff586501dc69c4f66f7e9d4da1112ea970e7b5a276ed58459
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.ebuild
deleted file mode 100644
index 45db95baf177..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.4.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
-
-QT5_KDEPATCHSET_REV=1
-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.5.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.5.ebuild
index f19faaa44315..cf8ab2aad14b 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.5.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.5.ebuild
@@ -9,7 +9,7 @@ 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 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 8434fd997bc4..b07c6e529dc1 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,5 +1,3 @@
-DIST qtquicktimeline-everywhere-opensource-src-5.15.4.tar.xz 104348 BLAKE2B 0bd3ba5e18df88309418825428f23f1b64fa5e13b48c53b9f79484aa0997dceaf61248727d19479a7cf99ffb30197e95bf085d086dd2ef033dfc62541b26d362 SHA512 8c2f3bb898a56e78ddbf60efa40650e7203ed2cfc5c882619a20d65596c8538191f3ffb438cb38f41117fe07c04791af11ac2505dd521ca40ada33f6dc809e5d
 DIST qtquicktimeline-everywhere-opensource-src-5.15.5.tar.xz 104344 BLAKE2B e542add97b60963a91f7f4c9c8871ec095392a86b80a4ce9876eabf2040d7b03cd426a25ab03d109f822bbc8b557e04d03695bcd9598befe101cf3d0ddbdc635 SHA512 7fccb88fc371714ad4c1632e2919f6239cc240f8f5452796dac13e9ee6875b91e07a18ac039bdaf135d7cc44a5bc8d7adc6f48116910af73a2990b76f20e0742
-EBUILD qtquicktimeline-5.15.4.ebuild 367 BLAKE2B 9277628f8ddc066de3a200293cc02dcaa1c58127af081ed739a55cde5d0e9284ce76132d9392bb14aef54cf6167c6645d5c0af9136bf30a17bd9061561ba165f SHA512 0c4c90b683682a5e0a775f13f598b479344c51f5ee034275abd11dc23b7b4571e7b2f2a387a65211b22b73aec7c3e1b089e9b23f422e16765539a5b3516c0fe4
 EBUILD qtquicktimeline-5.15.5.ebuild 367 BLAKE2B 9277628f8ddc066de3a200293cc02dcaa1c58127af081ed739a55cde5d0e9284ce76132d9392bb14aef54cf6167c6645d5c0af9136bf30a17bd9061561ba165f SHA512 0c4c90b683682a5e0a775f13f598b479344c51f5ee034275abd11dc23b7b4571e7b2f2a387a65211b22b73aec7c3e1b089e9b23f422e16765539a5b3516c0fe4
 MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild
deleted file mode 100644
index f0aff5d0626f..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module for keyframe-based timeline construction"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index b89f2b431f4b..8bf3f94aec19 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,3 @@
-DIST qtscript-everywhere-opensource-src-5.15.4.tar.xz 2665104 BLAKE2B f57661251785d21983871840675c38184b01ae7cc216c9431400fcf2567cc446edca1250e8e1c66a6970dc0da9721368f9baabc362fcfffd1ea3d6e81196587b SHA512 01d3b03eec23f462a7931e268eb8572d85ed560dd8b24f85b420ff8ebb1932d4c18f47c8d5fad7b7c09c147158b02b6cceb9c571b10249ba4008b363e23d7f95
 DIST qtscript-everywhere-opensource-src-5.15.5.tar.xz 2665268 BLAKE2B f4b4749f83be34cf356c288eda85d7df6017625ba24b09a95beec513426e0c2603bdaea5df2244826239c879410446c9f352dc69091c1e3f1fd6c4f00bf7995a SHA512 62b1ca8684fb23357952d775f70675b2acda01d32d1672c1bdf362482632a772f1896764668c42fbc93597d6ea34afa602479d6b88e2d061f4554ab82fcd86cd
-EBUILD qtscript-5.15.4.ebuild 685 BLAKE2B 3fc07079a14a52774b26208963f00d6737646e1fcd05b7d3cba2a40abc2374e0a453f53cfdfe25c5c20b093262041466becc4d6d48f0ca5971b9687a4045807a SHA512 fdfb34d567c21db9113cb9638379ac0b9f6c6ea5f8fb2ddca0e3dfb084be9790729c655a23fe94c0f00b582f4cc3cf95d11a2d5358af65891a903a9d3d3997c2
-EBUILD qtscript-5.15.5.ebuild 690 BLAKE2B 9fdc6577697c1fb79b9794dc9832b6cefb21e794c1a902db1ddd8572277d1e5f6ec0a3c5df67cdacfe6e93d2c47cfcb6e53e7aa2a39594b8d3d35f6b579598b7 SHA512 d4acba1653f1964f2757c9ac1846416116571bf43fb22db0a29fe53d73682d9ab900b72e9918cb68965646eccdbada8d9d7ef5c3c66d1b784a334973e79536ad
+EBUILD qtscript-5.15.5.ebuild 685 BLAKE2B 3fc07079a14a52774b26208963f00d6737646e1fcd05b7d3cba2a40abc2374e0a453f53cfdfe25c5c20b093262041466becc4d6d48f0ca5971b9687a4045807a SHA512 fdfb34d567c21db9113cb9638379ac0b9f6c6ea5f8fb2ddca0e3dfb084be9790729c655a23fe94c0f00b582f4cc3cf95d11a2d5358af65891a903a9d3d3997c2
 MISC metadata.xml 583 BLAKE2B 5389c382561f060259c9eb626a98fa6d1861a33cffb3ca62899cfb6f1b020d6841314edd05c4fd0e5f05593f6015af8826f1d087078754a3dd31ae72be7da4aa SHA512 f8d07eb515db1b455670371655c572aac73653a2d1af68d8a226ecfeaf77b62737114a66bc41375cf7f32d575df792a685298487a90c650b6c6dfb4a7c113181
diff --git a/dev-qt/qtscript/qtscript-5.15.4.ebuild b/dev-qt/qtscript/qtscript-5.15.4.ebuild
deleted file mode 100644
index 579e5614509f..000000000000
--- a/dev-qt/qtscript/qtscript-5.15.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	scripttools? (
-		=dev-qt/qtgui-${QT5_PV}*
-		=dev-qt/qtwidgets-${QT5_PV}*
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		JAVASCRIPTCORE_JIT=$(usex jit)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtscript/qtscript-5.15.5.ebuild b/dev-qt/qtscript/qtscript-5.15.5.ebuild
index e41d31f3b5a0..579e5614509f 100644
--- a/dev-qt/qtscript/qtscript-5.15.5.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 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="+jit scripttools"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 88acf5669526..843f81e67921 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,3 @@
-DIST qtscxml-everywhere-opensource-src-5.15.4.tar.xz 435952 BLAKE2B 83b599360a3b82fa2e5e203f0a9dcf3ed52c4989f885540a5ffb203fc7d4d70f17c1a21fd1d81ff93b469c91eb3333b5c647c507214175da3c38d14651c7e9b3 SHA512 2664e4e707fd10aa2ef832fdfc133695da3f6f80c2a611dc94b4e22b34c3226d5baa1e5afc77db2115317c654460ebb60896c006aa93b324fe67d6860ae9b431
 DIST qtscxml-everywhere-opensource-src-5.15.5.tar.xz 436640 BLAKE2B 15ab4229707adde598674f85dfc9d2648d7fecd459b7bf80f369032a6bb6743f109863a9298b4d4c45b139321cc619a20e4b0ed7c51d37dc23f44cc7fe918a24 SHA512 7c24ba2c679f74e1ef06e2c49989665d58943376dea6ddf0c92c97e7a12f57af23d2c2df98d893d2f2754658a233e3091fa669e463ee421c0aafe01fee622ca4
-EBUILD qtscxml-5.15.4.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
-EBUILD qtscxml-5.15.5.ebuild 401 BLAKE2B ef9d8dcae6bc35e205f64f4491b35e8a31a985b2e0b606da226350c5fdf7d9aa73b4262262712cbf3cf860519c798a6d96be5e5d55522b35908f0acfb775f36d SHA512 23e9b43d699c05a0609c82d942d0278433a2a8f4f44d9936e2082b08aaaee28b554aa9248c3ad911261656274fe2c04e97c7981ab10dea243c059a7a9ffddc7b
+EBUILD qtscxml-5.15.5.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtscxml/qtscxml-5.15.4.ebuild b/dev-qt/qtscxml/qtscxml-5.15.4.ebuild
deleted file mode 100644
index a778e477a992..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.15.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/qtscxml-5.15.5.ebuild b/dev-qt/qtscxml/qtscxml-5.15.5.ebuild
index 0c8a34aec710..a778e477a992 100644
--- a/dev-qt/qtscxml/qtscxml-5.15.5.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.15.5.ebuild
@@ -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 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index fd9ade84e5d3..bbb1373704b1 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,3 @@
-DIST qtsensors-everywhere-opensource-src-5.15.4.tar.xz 2058828 BLAKE2B 86ff838bf3d02fcd42b280f6027e3d0e3ca93c17475cf85c9cec7d4615398c12d507f79a810f33491d5b2601566fdbfaa0371c2e3cd3349d5e29042846fb22a2 SHA512 b8b9ffedfdcd392bd5c1ab76db3f621d16094f444e14900726378a289c04c08a75b82628cb61f4ca66bba8c1eeba2a56d9f90d9a82adfdc90fc00ac1b579c63e
 DIST qtsensors-everywhere-opensource-src-5.15.5.tar.xz 2058852 BLAKE2B 1c869fb8341c50990dbb280139cd102791ab6c5dc743f3fbcde9c6bb682b043d56c446d03c494c4ffc3155760d349c50278a0aa5722659480c0a4f2906ed7a2d SHA512 a52439dc7008dc4ee7d9af98338ed42951190d44eddca1154080f2dbfb4547fe30519b7f87f16ede2db34e0b9da2751ccd605eb9cd1bee06ab19b6122d86d620
-EBUILD qtsensors-5.15.4.ebuild 559 BLAKE2B 78224588951cae1bddb1998a88a639d52ed8496ce5ab4dcbca7844e101338bd07056b31513154a0680a29c7c8b77a8e7236f45d0b39f18f5cd1d3c6d74e30d89 SHA512 58203d919cbf1946d01208df3ce4ac7ec37dcc516ce5c982d832d554224d50c65c90e9abc9736e0d9baf561504369eeb95250c4e24619b38fb2d2d5b0f69b532
-EBUILD qtsensors-5.15.5.ebuild 571 BLAKE2B c69f259d86408c8a5982a47e65d1cbb3a4e333618426233b0c78024d676342e0572c6891aceb085f10dac35f3a45d66d3183c6291d5ade215ddbad5b662925b2 SHA512 0282d4bb8b6d1add6ca2b7353f4867629caefd54af43f11e87e2b956d7778c28ac029eb461ba515cb7ff385cbe0e8f7fe352ee3f779fc184e0f28e8ac4209634
+EBUILD qtsensors-5.15.5.ebuild 566 BLAKE2B 814dd717a226d667ea5bd6f2d43223304daa270eac7ca5002bd3eedfacef94791ac832e13f2d3b61d47eff6c72f8b0d5a2f611f8f7a94e9859129e49c4472d11 SHA512 7abaf8705a0cd03abc6a8cd7357a7d0b8162bcc37f28e97136297969e9965c88325d199b64c2ef18b81d717df5db329293e645d36f985d73d2db1be37464780c
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtsensors/qtsensors-5.15.4.ebuild b/dev-qt/qtsensors/qtsensors-5.15.4.ebuild
deleted file mode 100644
index 0823e6a19fc1..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.15.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# TODO: simulator
-IUSE="qml"
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdbus-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtsensors/qtsensors-5.15.5.ebuild b/dev-qt/qtsensors/qtsensors-5.15.5.ebuild
index e49806ca7e62..25a0a7fb01ad 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.5.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 40c9aeec633b..8812bf05391c 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialbus-everywhere-opensource-src-5.15.4.tar.xz 358164 BLAKE2B d757170d7195afc106ff40ef1b24038a340712b3cebd7721373a01f337c4ff055a62b7927c082c5e801dcf2b493e3c88b82d9a257f29580f0a58e30375f41575 SHA512 931362b171799fd8e449d418c3ae80c029c39edffc66b5c3fa054991332950241803d282e1ae1e5f72c8395f88f9d82d6a2d04f00b3907b5e9f7fb5be4f555e7
 DIST qtserialbus-everywhere-opensource-src-5.15.5.tar.xz 358296 BLAKE2B 09a2ab142df2d33bc161f77798c87351abcb2f69804dd4cf548dc9ae962c8e26965b2735f0155f7d854cd94cf5803cac2d86c7095d25ffe7bddba1c472de1aa0 SHA512 58f0e63d2af70d39190323abc29f218e657eb892eacf4886a7eb9b7558f9c06288a51c85ebeb2982af58c8909f1de865b5089907cfffa1ff2938723b66b0d7a8
-EBUILD qtserialbus-5.15.4.ebuild 430 BLAKE2B 7970edf0e0fdfcf05f8d4108cb9cd6c98d32bc38eaa063f1b44e18bcaf939ee7dde16f61262570a50ca820273f890413dac1713396f78c8e62dc731e2c472068 SHA512 60a20b83efe552b946f7f086d61354804bdaf232b12cfabe22d3b4ec02958ed1c3e42f3bd3cb81d817e3a8d3b9db29818a5f8429c85e795d66e14149e139a526
 EBUILD qtserialbus-5.15.5.ebuild 430 BLAKE2B 7970edf0e0fdfcf05f8d4108cb9cd6c98d32bc38eaa063f1b44e18bcaf939ee7dde16f61262570a50ca820273f890413dac1713396f78c8e62dc731e2c472068 SHA512 60a20b83efe552b946f7f086d61354804bdaf232b12cfabe22d3b4ec02958ed1c3e42f3bd3cb81d817e3a8d3b9db29818a5f8429c85e795d66e14149e139a526
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild
deleted file mode 100644
index 1931b8c79e71..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.15.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtserialport-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index aef20306041d..8bd228d0202a 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialport-everywhere-opensource-src-5.15.4.tar.xz 323248 BLAKE2B 3c48bf1a9ad927c69f7e0b6bc425b8aa2182b2dac3e0a5f8cb2a434a815865d24da4237eabf3d3bf6276b3901015da2827063849223a9f845a6a3535eea10131 SHA512 d8bc3d0b89bb4fc05bfe27a4c76bc3732ef5f8ba889400c8116f18c2ed58db7a3b99c4bda1cd60d1e8051121d31a4b55b95d20e89578a6e523d527e6182262ba
 DIST qtserialport-everywhere-opensource-src-5.15.5.tar.xz 323168 BLAKE2B 68a3ae2f513d73908c48e87493c5213429160d41e770f9883439ca5d7f58c7cafead1acaf9b1a845c3480d5db0747cf9a356e14ecc1c7b69276979b618864aaf SHA512 479bc5a4bddc4cb7659d2768b51947847f3c413102554fe3883e1decc42e6c9d0ad693627f607bd8cec43fd014e495fa9812934dd1b8ce1cf3f3ad46b5f6c774
-EBUILD qtserialport-5.15.4.ebuild 558 BLAKE2B d92e70df53f6ead0ed247b8461bbf57ca2c83a0e9ef18feaf8052ce9ae23499432fc0c0491b316a53cfa2af41d6e784e9207b582ece8b415d3c4ac5aa99904a1 SHA512 d38f4ded5ed4a9d73b59ee7f8ef134d29d943a744b570ea794807b96b0debf3b2bceb10c80181f4ed6790d6c78323c6928129daf8fc22f5990eb54b2a937354c
-EBUILD qtserialport-5.15.5.ebuild 564 BLAKE2B cadacf7596b1ea9d16c5c1aee799394ea07c0156501bab8df204a8e50ea0a638010a7bb97b5e3a9699bf0a88166d1c61d5f1ea850404508d2599447b0b38a00d SHA512 fc2138cb67922a199ec66165e3bba761c59142680975e52a3a95a4445edc7e0272923150e13cb8b996c3b904d35fb87f8dc2043f6bed5ea63413dda5e93ec262
+EBUILD qtserialport-5.15.5.ebuild 558 BLAKE2B d92e70df53f6ead0ed247b8461bbf57ca2c83a0e9ef18feaf8052ce9ae23499432fc0c0491b316a53cfa2af41d6e784e9207b582ece8b415d3c4ac5aa99904a1 SHA512 d38f4ded5ed4a9d73b59ee7f8ef134d29d943a744b570ea794807b96b0debf3b2bceb10c80181f4ed6790d6c78323c6928129daf8fc22f5990eb54b2a937354c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialport/qtserialport-5.15.4.ebuild b/dev-qt/qtserialport/qtserialport-5.15.4.ebuild
deleted file mode 100644
index b0dd7a0e8062..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.15.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:qtConfig(libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialport/qtserialport-5.15.5.ebuild b/dev-qt/qtserialport/qtserialport-5.15.5.ebuild
index c00d38717472..b0dd7a0e8062 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.5.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Serial port 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=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index f7b0c93cdfe2..5ecdba6c3884 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,7 +1,4 @@
-DIST qtspeech-5.15.4-gentoo-kde-1.tar.xz 1036 BLAKE2B b842d09405198fee63d7ef54db26c683ec81319ae5fe48925349bec70e27019852259b80005d33a30b8462c573ab7e34308dc5d36c4ac0b99d273400eb7603f5 SHA512 5604f2c491ff9c33335c1f65fa67d17d0aac37a6dfc6b188053bf338fbabdf00243c6a1f1d4ff07a3344de5241d1fca08d82768874d2888cd02d3a6a4a675ebc
 DIST qtspeech-5.15.5-gentoo-kde-1.tar.xz 1036 BLAKE2B 6b8a8ccd2d69ed3f286dbeb00c0175c847768cf2f5256fdb3c655bada3fb39d6a5d65f539ffefbed06e8164e2d9e9914ed25d6757bd5eae7d4da002977a37650 SHA512 28983faaa642e35dd2d06bba308664a6598ef2fcf49a3841b38bd783504378f37407e3e24379c050c5c2afbaee5f457cf46cb79fadc304e0627a7dafd35cb818
-DIST qtspeech-everywhere-opensource-src-5.15.4.tar.xz 103820 BLAKE2B 2c9fabcda61223ead3e3a7d51f4b28c86048fa4e1766b7c43fe5c41470782edfd6a9b1b784a50d69f40efbd5b8aac44ad01427b013f3aa7530c466c393b0433f SHA512 6582fe36950aee8428c72582ff2eda2dae433ad969c323e0c6e8be611be7d81766ceb1cae85a10dcd4d266e33a0cf782fe857e1502d7f3863e0dfb2306af2aed
 DIST qtspeech-everywhere-opensource-src-5.15.5.tar.xz 103640 BLAKE2B 330baa5fe9f3fdd085e804780f60682d82ff1a80596661162dbb521de4bcf1584340a882a03405b71c77c247454c28cc9fd37200536c08b9b566af9cf0981a30 SHA512 b2f3a83a462c1f067804f8c2c28e47e76588cc5d70e3f0ec66a1955890b6a419371a769ec6f8867947f4a81cfc91db3bc65c1d628038cdec6c722cbfc1217aba
-EBUILD qtspeech-5.15.4.ebuild 736 BLAKE2B cbd822e11649702a466183361a95063a61e7e3074e56bba84360de3a906ae2a3b4ce9991d0b627074adfcfc8423d8ad1bee7da0b4e60d91061c1d3c5d22967b2 SHA512 4093d3ff0e2d50f3aa079a172ef88f05da150d3433be1cb13ce43b85c16652986d6879fc21c3a02c6d266e7f1679dfaf409ae66caf71f154c6520a9f61216194
-EBUILD qtspeech-5.15.5.ebuild 740 BLAKE2B 3f88c5e62f2b3b25ffe493fa0ec2afec53e1a31577c7e6f919c07cc85c741a28ea55fbef52a3ece6269f575f86b6f7ec4e7bbd735015ccab8c52b6da5d44e100 SHA512 162c0f9054acf0dfa55e2e23cb8611e324c26351473f70eff2783e3b184c58110f50a3421f046da513d3826b80e118892f70eaac64801fe056a9f474266e13b5
+EBUILD qtspeech-5.15.5.ebuild 736 BLAKE2B cbd822e11649702a466183361a95063a61e7e3074e56bba84360de3a906ae2a3b4ce9991d0b627074adfcfc8423d8ad1bee7da0b4e60d91061c1d3c5d22967b2 SHA512 4093d3ff0e2d50f3aa079a172ef88f05da150d3433be1cb13ce43b85c16652986d6879fc21c3a02c6d266e7f1679dfaf409ae66caf71f154c6520a9f61216194
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.4.ebuild b/dev-qt/qtspeech/qtspeech-5.15.4.ebuild
deleted file mode 100644
index a73f0796dd13..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.15.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="alsa flite"
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	=dev-qt/qtcore-${QT5_PV}*
-	flite? (
-		>=app-accessibility/flite-2[alsa?]
-		=dev-qt/qtmultimedia-${QT5_PV}*[alsa?]
-		alsa? ( media-libs/alsa-lib )
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_config flite flite \
-		src/plugins/tts/tts.pro
-
-	qt_use_disable_config alsa flite_alsa \
-		src/plugins/tts/flite/flite.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtspeech/qtspeech-5.15.5.ebuild b/dev-qt/qtspeech/qtspeech-5.15.5.ebuild
index 09fec6976129..a73f0796dd13 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.5.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech 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="alsa flite"
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 5f6f3e95979a..a74cc2b5b783 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtsql-5.15.4.ebuild 1265 BLAKE2B 13e902c32e37d5cfddfc7d250e7e534aadfd9eb78a4df108448ea71548d85e520e8400d98190bf97c370b10bd5f77e273d3a64ea43c909faf6db52ee0a710c80 SHA512 235338720210c84624728b09dc42a5fd8394b3d27d6c4242483fdfdaccf56b2ab6873f9843e55d1c254c5549952a54d5c552091ea951c926602d4ba6061e5f6a
-EBUILD qtsql-5.15.5.ebuild 1278 BLAKE2B 01521732844db011227ed5c6ebbecc2d1d1bed58a3f88bdb3824def04819c75679614f0d54c0969994d7f6538cb3128b4a968f577d15a9024c93ef71f269714c SHA512 626d27e070fa1ac548deecc56da08ef9e98296c253009bd56102c64488257cfee26b2ad90e477d5c9f623f18b60f0755235b247103a07f9e4afe51673ad083d1
+EBUILD qtsql-5.15.5.ebuild 1272 BLAKE2B 88f52cb97a7549e7a62d2a7519a6907b0941434188f4e7222a93ba2bd5c5b11ef12841f80b525bd5f6cbc4328bd41a264b82856f74507e1e04e4d9900c6fb6b9 SHA512 ba44241e78c299a38bc776c01a51d38552420ad0b19125c68343f932c784b8931252c847b3fd75b71c39cea14c00a9268731d06816929d3e08e835d0a2d0a6f8
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.4.ebuild b/dev-qt/qtsql/qtsql-5.15.4.ebuild
deleted file mode 100644
index 475735092f6c..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usev sqlite -system-sqlite)
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.15.5.ebuild b/dev-qt/qtsql/qtsql-5.15.5.ebuild
index cf831ef54fe7..3c428c7a673c 100644
--- a/dev-qt/qtsql/qtsql-5.15.5.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/${QT5_PV} # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 0e60bfdf33a8..c1cc9862262f 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,7 +1,4 @@
-DIST qtsvg-5.15.4-gentoo-kde-1.tar.xz 6804 BLAKE2B 30e43ecf736cc2f9067e82fc55d7253531684f256c8182ca14f3a9d211f836e782576d56ee31169951ce03423755c5382e4f865f55694b80ae4a3ec20de08483 SHA512 ee2cd718683a445ea21961b8b79e95132a0ced5ce370aed020c0c55ec4d7bf2b4c465cd0b16c2b0294591e78cc95a5941677f947a08ca8960bafac208ad05514
 DIST qtsvg-5.15.5-gentoo-kde-1.tar.xz 6796 BLAKE2B 03e80a083fef2b595d11e53cdf638082dd0a3da60a0c275d188bdf3967c0c7ceaf715e01917cd178d08714aa83827f1820c1c030253359b2018894ee805c2ff1 SHA512 31b7c804aa907aacad00debf318dd04700f16b437428ad9f5a1743dc1de3dc998b134a756395db6b439bee345d38569623a9baf1bb9f429ef068ffd7e1da593a
-DIST qtsvg-everywhere-opensource-src-5.15.4.tar.xz 1888900 BLAKE2B ceb055e09f877e826c36569ff41cceab69b8da9eebdb5b7851a582bb4389d16feb939257b8b102aef7229ca8c8777ac0f586d554a88606cb27d287de4a5f5246 SHA512 364400e17cdc659ff1a521f7bd171c5dfe537136f263cd5f64c6b5e27b0398d83ae0b5fe46e77847f3a2feccf0ea75f9591ff4b932d0250e5859272630b5a31c
 DIST qtsvg-everywhere-opensource-src-5.15.5.tar.xz 1888600 BLAKE2B 3bf675d3ac14f64c9afd096342ef4fb574c6b9d93f52b6cba3a5184b8f0f54204c90a133193685a4838236eecb72e5329eb2254c80948fa55a6a103d52256b0f SHA512 7938a84abca282f263f7840425863379ed9e0f9854ecfe38e5d1edacdaf39b2516e9e9b8b5dbcf52113785d8c4123ebea550f441abc000d01c07a20a6a742ac4
-EBUILD qtsvg-5.15.4.ebuild 508 BLAKE2B b8ff9b538c8348a5b25c09fe4063962c40cf6262274cbcbeaf5a27227556083e49ff6b134afabf968648ad85dffa0b31fbe1b109dd23e314b0c89354f31a514e SHA512 f6fb04786de78cc499fe09ce6fc28b088fafcae699736d8ba7ae47156ea2c4aafebbedafd027844961b4e721ab87cb59c4ef3ee3e1e2426de09615da601bbf73
-EBUILD qtsvg-5.15.5.ebuild 514 BLAKE2B aa20724fb6b6457e8a3b7839ef1e6f6b0e5477f8f97c7f096b168b192525094d23fa00814cb9606c0ae75e0bfe7a4c04daa2b9b3d3448c08bfb251426f90460f SHA512 f9e88adf324eb0407b813e8152f33e3e39e6f36622fc5cd5b971069a91c2048349f66b4b3b22b35b314117aaffbb5e6c7ee707eed359761d5bf96d7ad73f2bdd
+EBUILD qtsvg-5.15.5.ebuild 508 BLAKE2B b8ff9b538c8348a5b25c09fe4063962c40cf6262274cbcbeaf5a27227556083e49ff6b134afabf968648ad85dffa0b31fbe1b109dd23e314b0c89354f31a514e SHA512 f6fb04786de78cc499fe09ce6fc28b088fafcae699736d8ba7ae47156ea2c4aafebbedafd027844961b4e721ab87cb59c4ef3ee3e1e2426de09615da601bbf73
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.4.ebuild b/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
deleted file mode 100644
index 9e5f77ee3f3a..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong 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.5.ebuild b/dev-qt/qtsvg/qtsvg-5.15.5.ebuild
index d7fd49fe4a7f..9e5f77ee3f3a 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.5.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.5.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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 25b11116cf0c..7d3157aacc44 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,10 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
-DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B b7f94dd5315b9a16647c2d035fefc9021c4fcfe72a9010713ff6e47ebd1aca575778a02f96c81256fd38b6b58138a6ecd4ce046a6e4e3b0e0a4edfc64100c4f0 SHA512 f616fbd226390e8995008d22dbc35607f26eb5feaf436cd9b35d9ff0c2e428a4b75d0c91ba28660b488b03e1acccf8a2998dfdfc988335b3b37f6b6ae17106b3
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qttest-5.15.4-r1.ebuild 592 BLAKE2B f14c113fc74202393dfff287806714cfba0809bf3c84dba40069258d20bc9f1ea4678bc0d1b0704bcbd45362c5123227cfe681c582f231af89608b6cafc51564 SHA512 4a5312edb8fbf113b1a9bbdae00d922c8ddf62673fb44d62b7fd534cbc4a69471f089d88f952e17f03ad77fdc124f82ae7fb480fee97153fc9bacad68f5cd1fd
-EBUILD qttest-5.15.4.ebuild 590 BLAKE2B fad8b7e48cae65dd8830cabd12009be04b0d8a5190fd42377eb92eb848ed1627fa59d2d017de834193bdab503aae29c777c9a52ddd510536ea5663c27fe32331 SHA512 b6df9b5dc87ca3c54cc1947d326619b09a7ced1ffc187376914ffa2bab7a5ec095b7996fda2e7c78d064f2920ddf7487bed097bf213cf1654e74754c22e7668f
-EBUILD qttest-5.15.5.ebuild 596 BLAKE2B 9f10d82dbddd33b9ab317d60099720548f2b80320d111a185b2c9baf1bffccb72f49aa70a3e7e4fc86f8d86c4c30bc5626b9b977f11b0d8703d36c099b288b23 SHA512 97a048ce2d1cd9ec24fc12564db4de1e53e752df94eaf3cf6fceba4455b3662770fbcaadf1b694ee84bc5bc8906d518e220871d23823a499d1985fb60710aadb
+EBUILD qttest-5.15.5.ebuild 590 BLAKE2B fad8b7e48cae65dd8830cabd12009be04b0d8a5190fd42377eb92eb848ed1627fa59d2d017de834193bdab503aae29c777c9a52ddd510536ea5663c27fe32331 SHA512 b6df9b5dc87ca3c54cc1947d326619b09a7ced1ffc187376914ffa2bab7a5ec095b7996fda2e7c78d064f2920ddf7487bed097bf213cf1654e74754c22e7668f
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttest/qttest-5.15.4-r1.ebuild b/dev-qt/qttest/qttest-5.15.4-r1.ebuild
deleted file mode 100644
index e4d0beb4e8ca..000000000000
--- a/dev-qt/qttest/qttest-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=3
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-"
-DEPEND="${RDEPEND}
-	test? (
-		=dev-qt/qtgui-${QT5_PV}*
-		=dev-qt/qtxml-${QT5_PV}*
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
diff --git a/dev-qt/qttest/qttest-5.15.4.ebuild b/dev-qt/qttest/qttest-5.15.4.ebuild
deleted file mode 100644
index cc6b32241615..000000000000
--- a/dev-qt/qttest/qttest-5.15.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-"
-DEPEND="${RDEPEND}
-	test? (
-		=dev-qt/qtgui-${QT5_PV}*
-		=dev-qt/qtxml-${QT5_PV}*
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
diff --git a/dev-qt/qttest/qttest-5.15.5.ebuild b/dev-qt/qttest/qttest-5.15.5.ebuild
index f7995c457f08..cc6b32241615 100644
--- a/dev-qt/qttest/qttest-5.15.5.ebuild
+++ b/dev-qt/qttest/qttest-5.15.5.ebuild
@@ -11,7 +11,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 48af70c6c7fc..55467469a8ff 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,7 +1,4 @@
-DIST qttranslations-5.15.4-gentoo-kde-1.tar.xz 1108 BLAKE2B 873e90fb86fc497a36e4154018672b57c6475ee46b834648ce0b0f1236ace237621fe868702b4bf72f49dea46074819f65a0d1c3f325ea6d0bca088dde4ff195 SHA512 ceea094797fa1bab6785f49dde3db225b21e5f7e76459776f0309c1eb073556de9d40c102c7fc3b7a102ef69f021225e71a212417afc1a7052e94ca97e7d1f95
 DIST qttranslations-5.15.5-gentoo-kde-1.tar.xz 1112 BLAKE2B c2233174b392ba43eb22797b9fce91990a1ba9850faf1adb23a5491493af804267ece5319aad46d49400ef85289c410edd076b9f2327d553437e6f93875ceeab SHA512 0cd90dffb96bdb4882585e0b21d13b51d546f070f54429b52d8f435a6612c9d3ad5b7d33aac56f1cbabb74866136a2aae5916563caab8e252eadcaf77ed834bd
-DIST qttranslations-everywhere-opensource-src-5.15.4.tar.xz 1618964 BLAKE2B 9377cdaee2839fe0672596e041502037a345bbb52b04a1ce8aedd46e542301c3883e378a9406d0112f615cc46172df062182d6530390dc3ff3bf3b78b6dac644 SHA512 56b20c0174cb68c3e4def85ec6c113576bc8872d1cdac318bc3d9a121645f67ce68e9bd3a73e32fd53617fcef641fb95831b37c40f1250c1c05e109e55b41ee2
 DIST qttranslations-everywhere-opensource-src-5.15.5.tar.xz 1618860 BLAKE2B 1562bc66c0d85c85d804df5f986f67d78ec96524fac0e601ada54352662d05f55e1216165725396f3a3583efcf236b0add2379eef159c5c984ef4114dd2c4163 SHA512 56a13156f7a7cde347b6413eb1f1f29121a70a8e20fd1d947fe093d6721598da26f63fc49aa6f99a4f4c1d213ea426d8e6897b51d858881a2d31d121740a60d3
-EBUILD qttranslations-5.15.4.ebuild 414 BLAKE2B 69361c405d5c00b9bcda9dec48a85d2785ca18da9d9376bac83fc5274482eefcd54e7a78753a390df7bd0a6a6640f7c907c4b6fee1218083c068008e4fe8e28e SHA512 81dd27a69ee913bc75bb5f18dfb0644965b62d89b7066bac4dea3036cc236870324aaf3666d95c7b517dffc6646ecb99ef08f40be550d61142f7607f15497b5d
-EBUILD qttranslations-5.15.5.ebuild 420 BLAKE2B 76b6765f53c4e78d4704c8f73aac4f7d3f36b28d8a8d3542d6d317bb7fa05291944c637e305275feca8d310421eeb0760a76ea6b958b748734f03a3f39d605ff SHA512 e5ed99ec7ed08b08c28075322b4b04a6e46c083e49a0812d9a54f508ea24463a1b41826be1d9762bc11f1cf980e31a3bffbf17c851416f1ab4ed82e821bf7b5d
+EBUILD qttranslations-5.15.5.ebuild 414 BLAKE2B 69361c405d5c00b9bcda9dec48a85d2785ca18da9d9376bac83fc5274482eefcd54e7a78753a390df7bd0a6a6640f7c907c4b6fee1218083c068008e4fe8e28e SHA512 81dd27a69ee913bc75bb5f18dfb0644965b62d89b7066bac4dea3036cc236870324aaf3666d95c7b517dffc6646ecb99ef08f40be550d61142f7607f15497b5d
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-5.15.4.ebuild b/dev-qt/qttranslations/qttranslations-5.15.4.ebuild
deleted file mode 100644
index 073564389e0a..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.15.4.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="=dev-qt/qtcore-${QT5_PV}*"
-BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*"
diff --git a/dev-qt/qttranslations/qttranslations-5.15.5.ebuild b/dev-qt/qttranslations/qttranslations-5.15.5.ebuild
index 94f881040c15..073564389e0a 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.5.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index e6ba3ace494d..293832236ec4 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,4 @@
-DIST qtvirtualkeyboard-5.15.4-gentoo-kde-1.tar.xz 2968 BLAKE2B c1d8fa4309f1bdaff7240177ee0ea5487ea4d36c591c44ab4144afbd73051fa051376ed071eefdd1e9d85bc0f2fa386770b06c64cdff62b759142d2f5f2dae79 SHA512 b5106085b9e40071fdc1776afede0065218e8585e73c1367a7ae428641b4be0664146577f8de41e83707db5a3b74347821d5f485458fdd4642090c9c2351aa98
 DIST qtvirtualkeyboard-5.15.5-gentoo-kde-1.tar.xz 2952 BLAKE2B 1aa3d5ea3d77c7b934d67182907028a7636c7b80893583b333ba39ebc8bafa52e6281468eea986d3c7d187c8a0c2abf98026509498401af8262a2c6b4f6ff9d4 SHA512 d7a80be4581a420b4ed8c96f88811d804cc1e030764bdc50b0d67fe00e4671423c52708a472527e42322bb7ded5177cbb21a69dcb3fa73d373aab97e494683d8
-DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.4.tar.xz 10964124 BLAKE2B c688273a37243b68fd228de559baa8fd6def9f772bc8d032f9947a19541ac27e748cea6b1c33777e8a79791df75da6164706aa9631106f562965bb4e14eb8b5e SHA512 870279299a5e166badea0746a2d4badc758c66f8404e36d1df05997dcfeb66733154fc2a9830c433fbacf885b7afb44bc8dc8a5aacc02713966630ce98231ba3
 DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.5.tar.xz 10957016 BLAKE2B fd3bd39ad64868c5b7e540ead4ad22e40cd253338e876de3e17f6924aeb344c314b6ace4603169859afc11fd9d0f23aaaa5d9d74d97d8850b9e8d047821d56c5 SHA512 d6ef4a067fc0af3bf562f68382b32c2eccaf21638cd89a79ad011fd640581448e997d67f5994ef1ac975df501cf6a57321d6f37426901f3db70c28c14925737b
-EBUILD qtvirtualkeyboard-5.15.4.ebuild 1243 BLAKE2B 68a7afa2bf230226abb43df6f46d18979169e5182b242ec23491dc7342215511000b581dd27db2759cbf814d8ca5acc5a3b7199b13729002c9c6a11fd55ce500 SHA512 ab6774a30655d7e19c781cff5b29c05a4c0a6e73f6f4a9e21a60129f3184dd2ccf553cb0237f0f267ea0ff31d76ec1ee3971ab1c9ac65e1d40fb887831eb09b6
-EBUILD qtvirtualkeyboard-5.15.5.ebuild 1253 BLAKE2B 347a1dd0f700757d8a38be18e80ab3aa32614f5365f6e7f3f09c730d2e2437db7bf7cf83d8193b631d5e7e39e50dd5f7401e37ffabf759e0716d3e24fd688abe SHA512 fb275022c9236884e9d5aa64542a9eb09545281c10b418af310be9145798558ba0c2cd5711abb042534fac3f1a01b6bd50b63b271b3f6873e094eb382025df19
+EBUILD qtvirtualkeyboard-5.15.5.ebuild 1250 BLAKE2B f20bbfd4b978f43796739766d1d9d4630da6698c243e0d914298228ef98a7aa8f2172a053d945dbe4224661f10cfa071b7d61831bb2ebae38c343a1fbbeb4c1f SHA512 c8bb81f178d8de77ef1e92d3b61466da615e1ef6bd59d3d657088d9d820e978bb2026741b2fd65e591c40ac39693a236aca58309f54952a3ae9e3bdbb164e5a5
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
deleted file mode 100644
index 9ee74099b8cc..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-# TODO: unbundle libraries for more layouts
-IUSE="handwriting +spell +X"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtsvg-${QT5_PV}*
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usev handwriting CONFIG+=lipi-toolkit)
-		$(usev !spell CONFIG+=disable-hunspell)
-		$(usev !X CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
-			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
-			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
-			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
-			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
-			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
-			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
-			lang-uk_UA lang-vi_VN"
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.5.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.5.ebuild
index b90951ebaf95..f2b558a95463 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.5.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 # TODO: unbundle libraries for more layouts
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 836b02a5c54d..9cfda3c5da4b 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,9 +1,6 @@
 AUX qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch 4691 BLAKE2B d817e7715759dfd6a6efc13b3b8e7742406b3af7cdf8602e134121b8d6e97e857dc82bb71e32c0ad04a04fc8f20443475bd5a251ab6eb0c83412a75201865561 SHA512 82ac704e0a57a0e6272676c329e29116a7ab4186c94a1e81fe4f503bf332b20b699930d86ff22e9a83e72be856a5711230f264a6d10991fd070601ab4e4fd67c
 AUX qtwayland-5.15.3-clang.patch 405 BLAKE2B 914a7448f590cfd6e83ca32352070644bbb6c07bd794d6f86ff6346d4697f6734d4c61469f20fa27517cf14f4742df946dba1f20ac242ea50d8e712733e3c099 SHA512 41da7708a596eabbbf58baa2d081c6a870fd49ac5b284c094e7e3230df201ae29627de1470bc3a80aff3dd30166b51bf9fce53e3d6fda0f18b97452fda3cd467
-DIST qtwayland-5.15.4-gentoo-kde-1.tar.xz 32156 BLAKE2B b18c35f07bc20ab778d925961486511e90dea3e04bd83730f54fcc94d7a8680d86f33b7087e84cf77e283a20514472caeadb7409fe59117f3c066dcfad4ba46d SHA512 a86fd28cbaec35a9c616584ea7b65d4acac0b98f58f58bd32a11a586d8b2c8cc6f8f95e70d1f9deb9136515328ee03af57479ce68b34ddccdb6e8e3110a0707f
 DIST qtwayland-5.15.5-gentoo-kde-1.tar.xz 32076 BLAKE2B e42d847deaef08271eb2f3211db7496bb1d3e1da976cf242f2129775c0401eb834fd7c94b35ac58d601eb28e770c3b6bedaf4135e5ad97f43e0adee5054214aa SHA512 277c3612de892f21058bac3ef9c2b3584aa43850e1f6dab0c43989a952e30656c6069d1f7d07b0f1df7d1ec2ab1893a0ba1c4c6fecc6f56c101333832bdd483c
-DIST qtwayland-everywhere-opensource-src-5.15.4.tar.xz 567300 BLAKE2B e2f77a8e6a81ef105d218db6f40164b95beee2d3f34253b4208170a1a25f52ba2574d231979ec05d2bfa7d41a1949b01bd3f6bfcab75487e88d11b6fd1e32455 SHA512 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4
 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327
-EBUILD qtwayland-5.15.4.ebuild 1147 BLAKE2B cb388d4b724850c2ac83f161f5546d12f9bebf2193c73f3252abe1afb9de5ee8d277b84dd539a159191c50e011c42bf643a76a0ccd2950b815edef36f1f45245 SHA512 55e53e006bb1d8f138e7c9ffe40eda9b670a0d82f22b64d6867db3285ea84846c205df1a3c3516c1636cfa20a825338ce16aa1c1cce753e93730ade702f32f80
-EBUILD qtwayland-5.15.5.ebuild 1153 BLAKE2B 29de8369566e9f2d50e120f26abe9951ff0cf0abcbdfc8b1e7071491bafb7b3063016f9ecc347a48e574a99a22bc218f75d750d12f6a5779629c23dd2a0edb78 SHA512 3abbfe0f73665a62bf146a094ff896461cc8b1ab78dbbf3a595fc06e57309ff6c86f684a643a9bc1e77107d71d4ed31b23d32ba7804a8c216669e9e7e513fafc
+EBUILD qtwayland-5.15.5.ebuild 1147 BLAKE2B cb388d4b724850c2ac83f161f5546d12f9bebf2193c73f3252abe1afb9de5ee8d277b84dd539a159191c50e011c42bf643a76a0ccd2950b815edef36f1f45245 SHA512 55e53e006bb1d8f138e7c9ffe40eda9b670a0d82f22b64d6867db3285ea84846c205df1a3c3516c1636cfa20a825338ce16aa1c1cce753e93730ade702f32f80
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/qtwayland-5.15.4.ebuild b/dev-qt/qtwayland/qtwayland-5.15.4.ebuild
deleted file mode 100644
index a3da0ab2459e..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
-	dev-libs/wayland
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdeclarative-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[egl,libinput,vulkan=,X?]
-	media-libs/libglvnd
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		=dev-qt/qtgui-${QT5_PV}*[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-QTBUG-90037-QTBUG-91264.patch" # upstream pending
-	"${FILESDIR}/${PN}-5.15.3-clang.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	rm "${D}${QT5_BINDIR}"/qtwaylandscanner || die
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.5.ebuild b/dev-qt/qtwayland/qtwayland-5.15.5.ebuild
index 2ed3730fc4d2..a3da0ab2459e 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.5.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.5.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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest
index d1fd42058de1..a089d6e01c2e 100644
--- a/dev-qt/qtwaylandscanner/Manifest
+++ b/dev-qt/qtwaylandscanner/Manifest
@@ -1,5 +1,3 @@
-DIST qtwayland-everywhere-opensource-src-5.15.4.tar.xz 567300 BLAKE2B e2f77a8e6a81ef105d218db6f40164b95beee2d3f34253b4208170a1a25f52ba2574d231979ec05d2bfa7d41a1949b01bd3f6bfcab75487e88d11b6fd1e32455 SHA512 58ae262f7aa0455fb577a36fe9413a969398a2043160642501bac064d6fbc3280f76aa566e62b9d73c67a8c3606849b1b97bcb9b0250d26c269ec921112f40e4
 DIST qtwayland-everywhere-opensource-src-5.15.5.tar.xz 567384 BLAKE2B 01ce4d546bda7bf332f8cc4f86a5e8bfb1be0ef60336ee3cae58266a25d51cf00fef3e6c4204f0179abc2ef748f88bd3a20f89f36da74d5d15c70ae7b4975186 SHA512 828dceb7bc54ce610a73f110f0aca332a90cf95df4a3bc971bd21c4e878366cb8d2248e609b73ce4d381579a143843c87a62f23dcc95767e522874e53a1b0327
-EBUILD qtwaylandscanner-5.15.4.ebuild 501 BLAKE2B 0ac3644489597447c10b522c4c0f3728cbbf2a3707a2693b3fbe49069a3631b758ec4e1852e47c191cb8f9da0dbb57be190af12c06b68c17e4e6df6e06005720 SHA512 2467890339340c370fd4d66f31ea21e4fb01328faf1fa4cbfaabd9b87f8aa5a06513614e91283f01df19dcedcdd76f3e686697b68c44730442b555efad8f6602
-EBUILD qtwaylandscanner-5.15.5.ebuild 507 BLAKE2B 6872ab6630cf660041fa9d9b911a71aaef0d987a03d2d354dd55d7cc624f99d924fbeead812c202e53d9f322999a6f549024cb34db9aee0358d1d528265aceae SHA512 5f8e3bef71199e46a99e10eb87e43c657423fe2239a93c1fa5403484dd3002f1e8c30a6a406725923f818b4989815d59aabf89a8b60cd64af22a71852b7acd1b
+EBUILD qtwaylandscanner-5.15.5.ebuild 501 BLAKE2B 0ac3644489597447c10b522c4c0f3728cbbf2a3707a2693b3fbe49069a3631b758ec4e1852e47c191cb8f9da0dbb57be190af12c06b68c17e4e6df6e06005720 SHA512 2467890339340c370fd4d66f31ea21e4fb01328faf1fa4cbfaabd9b87f8aa5a06513614e91283f01df19dcedcdd76f3e686697b68c44730442b555efad8f6602
 MISC metadata.xml 352 BLAKE2B 7354be163c38b0299856f17a85621782e367e3186e0cece5d55a29d4848ba95a7d0ebc4e1614b9ffa3de21bad70c7c7ecc86fd81a0cb83038c619a1e763fc211 SHA512 cc03c3e78ee03f9be941ce1b54ee4ffa5655c933d2cd4c2bcc252a447632ed0587d41c4d07b9e1738aed5526b4f0b934342cb99d196ba3b0f49b762bf1de7c7b
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
deleted file mode 100644
index abdeb44b6b2f..000000000000
--- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_MODULE="qtwayland"
-inherit qt5-build
-
-DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
-RDEPEND="${DEPEND}
-	!<dev-qt/qtwayland-5.15.3:5
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtwaylandscanner
-)
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.5.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.5.ebuild
index 7d5383f04ba0..abdeb44b6b2f 100644
--- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.5.ebuild
+++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Tool that generates certain boilerplate C++ code from Wayland protocol xml spec"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 DEPEND="=dev-qt/qtcore-${QT5_PV}*:5="
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index c1a9cc70fe59..85482dae5e4e 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,7 +1,4 @@
-DIST qtwebchannel-5.15.4-gentoo-kde-1.tar.xz 5780 BLAKE2B ce4325efd23f9b207c5bf62a8f2740fbe05c706768f8bd227c0fc8a99279a93363123decde4fa1ec696e5b86e258c13c0ab98a53903634252b7ed2fae5d6fc0b SHA512 63f8840ff8811f2c671ff8b863682775569cf752965c4c1a381a249a641926990aa31e6e73f94776bdd71b5db80e4a3c62b479a770249b55231790df41997756
 DIST qtwebchannel-5.15.5-gentoo-kde-1.tar.xz 5780 BLAKE2B 304a4cc0c5598412bb516679f65c5771eadf517e19d6fb026b3496664360e5a2b07d37b3d47cbe4b6e2638f35aa631f7dd4c17b8debe6805a0ea7c6749f491a5 SHA512 b5ca4905f8dc2b1efaf7e5d81c7cbd7decde95887132a548b3b1e1f1ff3c57d6af28020c53c7f9a714633753836bc4c04a6353e7bf587655e9f59d98ac3b8703
-DIST qtwebchannel-everywhere-opensource-src-5.15.4.tar.xz 210728 BLAKE2B 276792545d413cb5522fbfd5602224e1a8c085919f89830892d2fecda88e09519bdc8d3b2b2e846ce2d16b6a6f20cd250c09c61e65ffd489b334cfebbc28488e SHA512 18d5e6f44b780c7dfc94e1620ba76d7b0731d671df537b2e29fef062a0775e8dc973deb6c949b37000f5e8a49bdd31a723aa069bafcb9ecdc3259d0bf97e5a26
 DIST qtwebchannel-everywhere-opensource-src-5.15.5.tar.xz 210712 BLAKE2B a07998872a3e790decb68c5a5294259cbeb393bcf90293b9f2a54484cefb7e443534b95866d5a90a28b2eeb3b55fbc7d33b4355c106e5e4acd6dc610a6327a2e SHA512 74ac09f418fd918cf5930f7d985fd69477da3ef1ecdedcf4b59eb9c17b43849876141ed6483dc32ef3e5e3f3fbc2a6babeb281f72da7850bfc677f2acfaad3fe
-EBUILD qtwebchannel-5.15.4.ebuild 604 BLAKE2B 7c990056bb14f9a555a9de45ee52f26f2f0afa103475edb0e54e55394443e242941657c659ef5166c2ae2d94521382a9c163b081b5c3f6879cc5865fb2074038 SHA512 4bac324583c4ab4a1bfd9ad7d7e144ba8c4310079fc91f4fe78fbe24b5e058652a729bf391937653ff1200b5e7c29787060e1376f26a884d4bd0cfc6f25dbf85
-EBUILD qtwebchannel-5.15.5.ebuild 609 BLAKE2B ea82e895649c165743983f95a5e9d1b4916b256e66df193038289866933d17065e098cdf2e90254bb98e58fa96a955ca1464f0cc75c847b66cd1b4b4ea62def9 SHA512 e4c2230b195cb08e7e3c9b098991a0b85b8a71d12ecf89b4382138f992aaef89fd58c9ec52ea3caa6f158a05a5272dda774cc20c28dfc183e8945f46103d73a7
+EBUILD qtwebchannel-5.15.5.ebuild 604 BLAKE2B 7c990056bb14f9a555a9de45ee52f26f2f0afa103475edb0e54e55394443e242941657c659ef5166c2ae2d94521382a9c163b081b5c3f6879cc5865fb2074038 SHA512 4bac324583c4ab4a1bfd9ad7d7e144ba8c4310079fc91f4fe78fbe24b5e058652a729bf391937653ff1200b5e7c29787060e1376f26a884d4bd0cfc6f25dbf85
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
deleted file mode 100644
index 648e932a01a7..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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.5.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.5.ebuild
index 0212d5c60e18..648e932a01a7 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.5.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.5.ebuild
@@ -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/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index bb0a784f83dc..4023f64a5cc7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -12,8 +12,6 @@ AUX qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch 2259 BLAKE2B 77426028
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
 DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
-EBUILD qtwebengine-5.15.4_p20220526.ebuild 9223 BLAKE2B 734141be64f31fccaafc4dc71e5eeea816e5bb6dfe545448dbee1d1df93b1a2aaabd359ab783a751c3b8838d8b224ae79cc231e113e05bc377b6045c12af0b5b SHA512 e326b28a15abac627250ecf72c536127a6473a688a1462f197baf8a6b5741985046440641982c1672fe565fb0d8dd98e4dc8b03e218b477c34f8c600e23244d5
-EBUILD qtwebengine-5.15.5_p20220618.ebuild 9285 BLAKE2B 6410002eff09d354b921fda49b3873214bce3d7a5d33b057c32ab39a46ecf35bd14c5c99afcdffb9aedb02cef3f7c8b9aed49a76230c0073ef183e7c49c6af56 SHA512 b4fd25d55d7b268edc6f1a99a4e6bd2a70e7ac9aca7a9334d321a99350f651da25abc913199a977be83e381280693c90491b904ec9574acb089676a3c846a751
+EBUILD qtwebengine-5.15.5_p20220618.ebuild 9282 BLAKE2B c8a2e6bb82be40f6f7d3fd18c1f6af7c3df433af0d027f0c88623686eabb889ed9ed6199679263a435bffb7890724638099aba97852afa51f69464ae0bb67b56 SHA512 2cd95bd77b1237c5f55e7f734245ef477af132fd69113e7de951db7f8e73b026dace177123c7abf778b83e49e0d11321bbec168e463ea4e8c78b3e13f85021f6
 MISC metadata.xml 1379 BLAKE2B 67b694ac104e8f16a0bb4a33bd178b4507b5c411d62634d88dd8187dd27b32d6a11829883cde03c0a856134c498df7d6c946221a05fec356e62296b64add4121 SHA512 afa7bd418df63335a1b6ad7f1a53be74a710ffaaee294a1db7691ce98d45d2e98e3f40c2e47e2e9e89f766122392def7a3c2198680413c647c9202c1f4c2f0e7
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
deleted file mode 100644
index 9ba4c484f9b3..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-HOMEPAGE="https://www.qt.io/"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-		S="${WORKDIR}/${P}"
-		QT5_BUILD_DIR="${S}_build"
-	fi
-else
-	EGIT_BRANCH="5.15"
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt/${QT5_MODULE}.git"
-		"https://github.com/qt/${QT5_MODULE}.git"
-	)
-	inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
-	https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
-	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qtprintsupport-${QT5_PV}*
-	=dev-qt/qtwebchannel-${QT5_PV}*[qml]
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms:2
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc(+)]
-	media-libs/libwebp:=
-	media-libs/opus
-	sys-apps/dbus
-	sys-apps/pciutils
-	sys-libs/zlib[minizip]
-	virtual/libudev
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( =dev-qt/designer-${QT5_PV}* )
-	geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	screencast? ( media-video/pipewire:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	widgets? (
-		=dev-qt/qtdeclarative-${QT5_PV}*[widgets]
-		=dev-qt/qtwidgets-${QT5_PV}*
-	)
-"
-DEPEND="${RDEPEND}
-	media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	net-libs/nodejs[ssl]
-	sys-devel/bison
-	sys-devel/flex
-	ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
-	"${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
-	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
-	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
-	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
-	"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
-	"${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
-	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-qtwebengine_check-reqs() {
-	# bug #307861
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your CFLAGS/CXXFLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g/-ggdb before reporting a bug."
-	fi
-	eshopts_pop
-
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	# (check-reqs added for bug #570534)
-	#
-	# Estimate the amount of RAM required
-	# Multiplier is *10 because Bash doesn't do floating point maths.
-	# Let's crudely assume ~2GB per compiler job for GCC.
-	local multiplier=20
-
-	# And call it ~1.5GB for Clang.
-	if tc-is-clang ; then
-		multiplier=15
-	fi
-
-	local CHECKREQS_DISK_BUILD="7G"
-	local CHECKREQS_DISK_USR="150M"
-	if ! has "distcc" ${FEATURES} ; then
-		# bug #830661
-		# Not super realistic to come up with good estimates for distcc right now
-		local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
-	fi
-
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	qtwebengine_check-reqs
-}
-
-pkg_setup() {
-	qtwebengine_check-reqs
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	case ${QT5_BUILD_TYPE} in
-		live)    git-r3_src_unpack ;&
-		release) default ;;
-	esac
-}
-
-src_prepare() {
-	if [[ ${PV} == ${QT5_PV}_p* ]]; then
-		# This is made from git, and for some reason will fail w/o .git directories.
-		mkdir -p .git src/3rdparty/chromium/.git || die
-	fi
-	# We need to make sure this integrates well into Qt 5.15.3 installation.
-	# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
-	# See also: https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
-	sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf || die
-
-	# QTBUG-88657 - jumbo-build could still make trouble
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
-	if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
-		eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
-	fi
-
-	if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
-		eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	if use ppc64; then
-		einfo "Patching for ppc64le and generating build files"
-		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
-		pushd src/3rdparty/chromium > /dev/null || die
-		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
-		popd > /dev/null || die
-		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
-		mkdir -vp source/config/linux/ppc64 || die
-		mkdir -p source/libvpx/test || die
-		touch source/libvpx/test/test.mk || die
-		# clang-format is used to re-format sources
-		# but we'd rather make it a no-op than introduce a clang dependency
-		# https://bugs.gentoo.org/849458
-		clang-format() { : ; }
-		export -f clang-format || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-no-build-qtpdf
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(qt_use alsa)
-		$(qt_use !bindist proprietary-codecs)
-		$(qt_use geolocation webengine-geolocation)
-		$(qt_use kerberos webengine-kerberos)
-		$(qt_use pulseaudio)
-		$(usex screencast -webengine-webrtc-pipewire '')
-		$(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
-		$(qt_use system-icu webengine-icu)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
-
-pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
-	elog "with additional security fixes from newer versions. Extensive as it is, the"
-	elog "list of backports is impossible to evaluate, but always bound to be behind"
-	elog "Chromium's release schedule."
-	elog "In addition, various online services may deny service based on an outdated"
-	elog "user agent version (and/or other checks). Google is already known to do so."
-	elog
-	elog "tldr: Your web browsing experience will be compromised."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index 43b46b0fbaab..b1d2486b0259 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 HOMEPAGE="https://www.qt.io/"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	if [[ ${PV} == ${QT5_PV}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 8ef035bc488d..ca8709b33844 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,7 +1,4 @@
-DIST qtwebsockets-5.15.4-gentoo-kde-1.tar.xz 2036 BLAKE2B 563c0baaa8ad1b9c786f354907a711ca79e037db2c6945ab2a385399f882a80e394857bf557eeaf1af6db6d01aefd0cd25ce13ccf58c2505b2f57a318a6f59fc SHA512 6191ce1b5d006a6b279c30f4bc7f78d544dabc57ec353cc24da35275ad4f87b6f138f0169e76b5a9c1db3d07c91c57ba20cde9979a85670e585bd1b6215e9cd1
 DIST qtwebsockets-5.15.5-gentoo-kde-1.tar.xz 2052 BLAKE2B 18a4cb3ccc6d08f5142601cb53c501f4883c3aa47f56ba977c5979be6ae3c90765c5a6205fd62caee1f93006d5bdf0ede8ca48e34ab11ef673e0287811fd9980 SHA512 7ae654741be15954da8d729180186e3590c88140e86260241ccb27badface40a76946d048c0dd3220734f19888433f3bd4f7a2094c6ea548703b961db3a2c189
-DIST qtwebsockets-everywhere-opensource-src-5.15.4.tar.xz 260792 BLAKE2B 5e494c712e859bac610547ab3c4fe7552b2a4fe6d0c120bd445937903b120395da21c0ebee5c1de97c02e60ce48e53551d6b509fecc5ca38e142677857130adc SHA512 01714b9927c3a234fac9386a596aa3dc3833d9cfe8cc152892fec969e51b428bed00f501c16b8e4f810452739ff8491e5c64f9b936aa10e1a839c09c8f2832ce
 DIST qtwebsockets-everywhere-opensource-src-5.15.5.tar.xz 260676 BLAKE2B a8a35e697c204cf1b2d87c80f6332809d3a9ee85cd26cf99cedbab13eb8cf386cbb74614bbb1146f3f734795b3123e25ac0059d898501b801c6843084601ff74 SHA512 2d44983e462a899c4adb90998b84d24466d70d8fab340481bc916228b289c45456ea5acde61a70aa9e3f9233216c5ca80375f190d9cbc406f8d40b535e90e480
-EBUILD qtwebsockets-5.15.4.ebuild 583 BLAKE2B 03765c46170ca5eb45df9f2773b60ef2fc126c9bf14bea4fc084f3984c3fd16a804de1625577da27658af0201c486f3a3ca1dc3977cdac546456954717cb707c SHA512 0fe201988a3af2a80c11da78c23e99f88abdbe45228284a24cafcc582118764bf761b5157476076bf1d448479ca874e7d83d2d39036cc386da4611dc5f28e57b
-EBUILD qtwebsockets-5.15.5.ebuild 588 BLAKE2B 58cb5ad4f59dcaab637ed79f17dba0e3b6aaf3ea053334a5ffcfc4e552f031b78318388f145688ca325bd7690fa0c2d63df7429bffbec7c314f71d2ab087c874 SHA512 cd482e8be55d55e371ebcdc70098d8691f30824a624568efde091d7c19eac5e2986ca718f111838c3b5006f626e4b2e424013cbcc07063401be599bb25477e19
+EBUILD qtwebsockets-5.15.5.ebuild 583 BLAKE2B 03765c46170ca5eb45df9f2773b60ef2fc126c9bf14bea4fc084f3984c3fd16a804de1625577da27658af0201c486f3a3ca1dc3977cdac546456954717cb707c SHA512 0fe201988a3af2a80c11da78c23e99f88abdbe45228284a24cafcc582118764bf761b5157476076bf1d448479ca874e7d83d2d39036cc386da4611dc5f28e57b
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
deleted file mode 100644
index a8691a3b4e74..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-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.5.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.5.ebuild
index db65f8a602ba..a8691a3b4e74 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.5.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.5.ebuild
@@ -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/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 3f15b7eec65e..ba408f2e63a8 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebview-everywhere-opensource-src-5.15.4.tar.xz 135316 BLAKE2B 7c8554abeb07014f51b9e61e352cb5b473973ae52c675a7027e95cfca2bf8bfecfac2bd2b5d1b1f6170420bd9a3c4280ee9de7604834cc42841ea0db51cc3dd9 SHA512 fb5177f0e8f79490598120f01b6cdd78ce5cbac8f313c0e088ded7b4daada290d2c058ecd6eebdba76fd15efd2e198bc03cbaf544fba664d49efb55709703be6
 DIST qtwebview-everywhere-opensource-src-5.15.5.tar.xz 135256 BLAKE2B 3e46a1293ef568eb6366e06daf7db0e5aab1c8b65f740ea4b6b95cbbd27a740aa4e056885d3fee4dff4b708a2f6094e518e7b5c5e32685a8dfccc46ecf9f71dd SHA512 ad6a9839c1a6e5b037b687bc1cec75a3cf8d10d66861ce88137c32107fca7351e8801da2a7ff623b0aaa1ced7430c4733593b5ec2d2bfdb7de98d9aeb9411287
-EBUILD qtwebview-5.15.4.ebuild 454 BLAKE2B 8f380ecf5efbd5e38d4b94e224cd191d342bc59c9730a929f6c1c6f5f68ff64e5b3b3604970396f05e7c7ce757d92c8a9b82868a37136b7ebb34f4ec94a4c35a SHA512 6ecad94dcfe6a2517a1af4194aad7ca2696d066bb2483ca73c8d45495c8389d1b59358dad8d71ef5a84fc67bc384dee6b141772cf0438a6edeae22037c57843a
 EBUILD qtwebview-5.15.5.ebuild 454 BLAKE2B 8f380ecf5efbd5e38d4b94e224cd191d342bc59c9730a929f6c1c6f5f68ff64e5b3b3604970396f05e7c7ce757d92c8a9b82868a37136b7ebb34f4ec94a4c35a SHA512 6ecad94dcfe6a2517a1af4194aad7ca2696d066bb2483ca73c8d45495c8389d1b59358dad8d71ef5a84fc67bc384dee6b141772cf0438a6edeae22037c57843a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtwebview/qtwebview-5.15.4.ebuild b/dev-qt/qtwebview/qtwebview-5.15.4.ebuild
deleted file mode 100644
index 288f86cec680..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtdeclarative-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwebengine-${QT5_PV}*:5
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 89215e6b4b22..6ae99e409751 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,10 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B 315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08 SHA512 ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c
-DIST qtbase-5.15.4-gentoo-kde-3.tar.xz 516480 BLAKE2B b7f94dd5315b9a16647c2d035fefc9021c4fcfe72a9010713ff6e47ebd1aca575778a02f96c81256fd38b6b58138a6ecd4ce046a6e4e3b0e0a4edfc64100c4f0 SHA512 f616fbd226390e8995008d22dbc35607f26eb5feaf436cd9b35d9ff0c2e428a4b75d0c91ba28660b488b03e1acccf8a2998dfdfc988335b3b37f6b6ae17106b3
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtwidgets-5.15.4-r1.ebuild 1202 BLAKE2B be5255b50d5381c5b8aaaf99714f2e9323a0a4ac544b50cd3cfbcc9c7e91a91899070d1015172e638278484e591b201aeb749707f4151b889c416713a0b4fac4 SHA512 5eca43a918613a7afb15bf8906328e3b0b5a1677414bc806ded798e6f3066d91295cdfa2cf5089e3bab60e64cd7b009e56692275664ad0bacb144edc3f714a27
-EBUILD qtwidgets-5.15.4-r2.ebuild 1204 BLAKE2B 02de93f89cb190837b3a21bd9000e887ab7954b105b3de0b756e83da66e34c1b647987764e294dab8956d248365a7814d204bfec7e8e02c1cd6d25d0d5c94599 SHA512 9847013314a8744b28e1a4d623d2d64cb174c7cd7b2a24874f39bfff3d6dd7b8bc2e924b915da6acf38bd72323f65e6d1fa5ad1b5811df60a0529c338eec95a5
-EBUILD qtwidgets-5.15.5.ebuild 1208 BLAKE2B e9a2f7e45dd76af77d7f3af625d2a1c6c9be269f9da5c47cbe093cf5d55cfe1eeb5af13e9b47fb17ac08510b0cc7947705e650f2487404732cfe656d3eecefed SHA512 679402294a844a74981274989e97d50d7d1b5e0e42ed450a77f7ce1909a20361ac3bb72174119021f656f3549c37bd4d235fa5477f6861e324edb6f4f564f635
+EBUILD qtwidgets-5.15.5.ebuild 1202 BLAKE2B 4b07340a89e1d70785fac371c793e17af1276e173d6f0b548bf36ff75effe09e92ebf419f56ae9672d7acf60e41fd126ac452e6273ed52e38cefd7b82267209d SHA512 e9a199986ca80b3ff20d8f9ae54d71c77725ea055f4b69bb17fd266b4aacb68a592d721987423c758b8d2f6784f7cfd0b33a72607341a5a7fb54a0433f6d1f56
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
deleted file mode 100644
index 9d46a832a7e0..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=2
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="dbus gles2-only gtk +png +X"
-
-REQUIRED_USE="gtk? ( dbus )"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gtk? (
-		dev-libs/glib:2
-		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	dbus:xdgdesktopportal:
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use dbus)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib -xkbcommon')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.4-r2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.4-r2.ebuild
deleted file mode 100644
index 2995b74f1e3b..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=3
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="dbus gles2-only gtk +png +X"
-
-REQUIRED_USE="gtk? ( dbus )"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,png=,X?]
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	gtk? (
-		dev-libs/glib:2
-		=dev-qt/qtgui-${QT5_PV}*:5=[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	dbus:xdgdesktopportal:
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use dbus)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib -xkbcommon')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.5.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.5.ebuild
index f19e63042ff9..ab4ec9a942fc 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.5.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 50b9364b5937..8a88ae6cfeb9 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,3 @@
-DIST qtx11extras-everywhere-opensource-src-5.15.4.tar.xz 145612 BLAKE2B 4c67f50d8a1cf152a5e46d208f4cd4faaa100d8b0a178bd610c825dcdf7cbbc0ec2b8ac904856ebc7b08aebbb9b6c4b6d0503fdc5af21d32ed3d4c2d7bdf170f SHA512 79c718eff9daba9ff3f361d38f828f8f3c447b87486d652d4ed1f964ec686259ae4d0a1a50b7b6b9349453ba3f8b56b3c20c8a5f26971d5cc3c8f99d668744d6
 DIST qtx11extras-everywhere-opensource-src-5.15.5.tar.xz 145540 BLAKE2B 07f6c65486231dbf744fa93183ffe98b0dbc6ce9b8d1e2545a25a015d1ae3ddd5b3a6214bf50eab3187af25e445f6ae18d86f5cb957f17fb2938e8d273ad6bbb SHA512 19ca14f0d4bcee08077cbbe81a8e6537fcc134036da1217c9744411d53ca5ebc14e96a8c25b15eb81795697628e6f64611dd3bc822621adcd4420a58a0c335b1
-EBUILD qtx11extras-5.15.4.ebuild 459 BLAKE2B 9369420be8b473cf8ce400e31ab2649ea755109cdec4929d20c7175ebb1a98770225cb9822f09df1c0926fc2d8b2499f5742d09c52e97e4af27b8b349afceb71 SHA512 dd3890acfa3e346a6dd48da61f06681d720915ee4dd3e44b25a9156125702fc5c20a882b4ed84e82dd337d09fe4836b222898fb54317be0b1bd63b5a8d8b1b1b
-EBUILD qtx11extras-5.15.5.ebuild 465 BLAKE2B e1c7a68dc4729e84db89d7a02903b146c19dae09f57e58aa5b728482cdc9b73f13f1ba93c5cb736dbdea32cd2d44ffd6bc7c1e29c2700fb743fbb72810cf4620 SHA512 e1e808b4f83fc3c11bbc32e56e5c8d4ef0955b70ca5aebf00e82d75fc91f2667d621c3c823927a1fb94575889c497ae3819c413f4fcfabd07ef7fb1bcac1a5ae
+EBUILD qtx11extras-5.15.5.ebuild 459 BLAKE2B 9369420be8b473cf8ce400e31ab2649ea755109cdec4929d20c7175ebb1a98770225cb9822f09df1c0926fc2d8b2499f5742d09c52e97e4af27b8b349afceb71 SHA512 dd3890acfa3e346a6dd48da61f06681d720915ee4dd3e44b25a9156125702fc5c20a882b4ed84e82dd337d09fe4836b222898fb54317be0b1bd63b5a8d8b1b1b
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
deleted file mode 100644
index a99515d6cfff..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*[X]
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtwidgets-${QT5_PV}* )
-"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.5.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.5.ebuild
index e1496666496e..a99515d6cfff 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.5.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 1ecbf8155a59..2ac730040a3b 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,8 +1,5 @@
 DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
 DIST qtbase-5.15.5-gentoo-kde-1.tar.xz 520224 BLAKE2B 48807bc79cede557b114786ee072d8d94545f4ada3d96aa4fe04dbf79a356dc6c17d9299014ed70aa10296346c30c7512fb7d9f88ee4b301e9a54a241363be8b SHA512 ab9f27d506d7aa1a9339ba52d51daffb4c6f9abb5d858fd728ef2110528bc0f2ae101b4e2e7c344836b42e4aafa2c5a4ab5c5fa37465e692cce500c0f3347fa7
-DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 DIST qtbase-everywhere-opensource-src-5.15.5.tar.xz 50247388 BLAKE2B e9bbfe8e73e6f25ccadeef722818b5aeb82d1f136bec21fcbc3b26bf76044b38f25c7268010c648e1161e9b61013b8b775f17b9fdcfdd70402bdfbf70bf7f9d5 SHA512 ce80eedc88abbd5a200bacc10a8e94adc1ef2122ac220715ba084adf1e32d67f2dc66168503de5fb5b5a6ab15f7a75ca23dc9956aed12ead994a8ffa6291ef87
-EBUILD qtxml-5.15.4.ebuild 540 BLAKE2B 8fe67c477cd44dce4a039e6b1a298346dc0ff7334a7b711a991d3f73097f7126c771879a6d2188573a89e83b869e92b4494c4205a602ab7f6abb92fb6316fc0b SHA512 8c1d6622f9291e3b85e0ae6ea4d0c5a005f9adbfbaab69b146f9dd1897c9af321ab1985b34afd2041a8edf46890b4796a7d7eef69f90d4e9665f692b1774d842
-EBUILD qtxml-5.15.5.ebuild 546 BLAKE2B 18746cfbc95c604fa7e0e31f75d2b39e89a936c46109ab324f388db5b161e040a64f582a14bd035d6c412336c32e43ba0fc18cc688c435f531a20c56a682ece8 SHA512 57b28889bd9d4260a9ec4530dbbfbacb15f9d70b3bd3686cf67da8608546dde2a442165805e3ea5cdda778bccfcf02257e866ddae2cb53d392966f24b3d3d20b
+EBUILD qtxml-5.15.5.ebuild 540 BLAKE2B 8fe67c477cd44dce4a039e6b1a298346dc0ff7334a7b711a991d3f73097f7126c771879a6d2188573a89e83b869e92b4494c4205a602ab7f6abb92fb6316fc0b SHA512 8c1d6622f9291e3b85e0ae6ea4d0c5a005f9adbfbaab69b146f9dd1897c9af321ab1985b34afd2041a8edf46890b4796a7d7eef69f90d4e9665f692b1774d842
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtxml/qtxml-5.15.4.ebuild b/dev-qt/qtxml/qtxml-5.15.4.ebuild
deleted file mode 100644
index cde4aacd89a9..000000000000
--- a/dev-qt/qtxml/qtxml-5.15.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtnetwork-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
diff --git a/dev-qt/qtxml/qtxml-5.15.5.ebuild b/dev-qt/qtxml/qtxml-5.15.5.ebuild
index 6ce2492b78c2..cde4aacd89a9 100644
--- a/dev-qt/qtxml/qtxml-5.15.5.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.5.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 03bfad667872..083ece4aaa33 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,3 @@
-DIST qtxmlpatterns-everywhere-opensource-src-5.15.4.tar.xz 5211620 BLAKE2B 2255ad1fe12a356b6b7aae515fa469df89a0d54e841062d68fa1f9b69d4fc88eab9f4a71510c6d8261bd146172b16a2fcb5b23127870a8a249573d1bca66cb63 SHA512 fc4b4723407f6a1e765933d9d76ec4ffe874cb4a70e47bc4110def2c4a491b86fa753c33ef31ef95ad1a6eaa3de1fadbc49deb7783d32d8fc2f51672670d5a87
 DIST qtxmlpatterns-everywhere-opensource-src-5.15.5.tar.xz 5210040 BLAKE2B f6f9b9c5a310328d17b316f62510aab1a07660756bbd9b982625b963e6851c004ab45e17b22014dd7d5aeb252fdd95c6ad7378227c2439134731d8320967d210 SHA512 553456f299c6812c058496f5e1d6a089df1f693dd1105fed80e6d6dd0cf143a0d74ade44408f48553ff3fac0951ab3f7384bc08535888354d921aa2d8428317d
-EBUILD qtxmlpatterns-5.15.4.ebuild 801 BLAKE2B 7c427cd11fe454b218e0d6e1c066fba3e1f9aeff5cc10de3737096900a18057594bed9f7ec1b6e1f97708370b04944d9d68f93f9dd30606c85fc7586e5443b49 SHA512 f69dc0523fb04eb5b632fce2acfd6b8cc22857e60011b1429a710f56a004ad606bf1de0dc151af51da9503f0a32bcc53a3945d2cce86518448f32f5ac70c0403
-EBUILD qtxmlpatterns-5.15.5.ebuild 814 BLAKE2B 502e80c994d5c718e028946390025ba1d0b44f618660b1b2ed915981871b619faab8b52903832e0aa01e146094db775e014e62d3c0684237c20d66bb9ed22943 SHA512 2adeef5e33b8d51bd451403993ba68ffee3a5ead6535c6a042f5ebd31c6d8fd6f50d4b5151d1b94c1e073d2d5ff29d7c505d8bcc814a71d8b3c007576041c9f2
+EBUILD qtxmlpatterns-5.15.5.ebuild 808 BLAKE2B 2c686a6a8b5382b6a0885a6b230bf7a6de1f400afc5ba33a15313ac4fd5ebc169784a175d3ae4d223cc2e63947777f9d8d236debc2343eb611cbbb9edfc8c842 SHA512 cb0659f57d7283e5b1174c64170284e06495fd98de769634877b17100371cd7b4fe30c3b7b2ff9d772ae16fd486cb54edf08745fd09c8eea2df2370c984a60d4
 MISC metadata.xml 590 BLAKE2B 2f67cb5fc0572aa19ed1775ac6a1cf2de7aae77141a76f81ad00d9620c0ba4238c1058ed53bd6332f8862f24cb59f3f23984df84d062c295868f3914ad8efb8f SHA512 50bbcf3579ec5613429e2a7c613e41ccd79d04f0ed7bb2e5db1ae22868aea8922f0b3509bc4fe91ab7cbc9ad6b86bb536993638d3562d811203814e64e2ae22b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
deleted file mode 100644
index 5d155fc8c5c7..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtchooser-66-r2
-"
-
-src_prepare() {
-	qt_use_disable_mod qml qml \
-		src/src.pro \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick tests/auto/auto.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path xmlpatterns
-	qt5_symlink_binary_to_path xmlpatternsvalidator
-}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.5.ebuild
index 0bad16383577..d36a6f02253f 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.5.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"