gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /dev-qt
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
165 files changed, 81 insertions, 3556 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index d4a6841b11cf..f993a9a04ec3 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 799ca4c72f01..8be7723c9e29 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD assistant-5.15.2-r11.ebuild 1268 BLAKE2B 544f6db99e16de4974069f3dae1587da31357870d86244c186ac498e55360a752740944a8fc8ddf4abeef94d8be74954cc918b54e78f4f0c1d33daf44f8498b4 SHA512 282e2a2d22fb092567909e25b754150213cc637c37dd632fd56d9634fe3ad4c483b3f90bd608721c647a32a7d98a4c96485807bcf8175b34a9eb0e6ce911e036
-EBUILD assistant-5.15.3.ebuild 1317 BLAKE2B 0e9990a056ec2b35127ce6f20592f3a409830111fb660252680f22151c8eb733be7883e0bcbfe296dbc8c6da5858e6d13698330f60cb17968e4dea0bf77f9f76 SHA512 45510d7b7ea9c4498e985952392f43a613bb1e3b9c0f186d4eb29262c5b293ea5cf202a582ddf6806450d8babf5dec1c294196875218a5f26950f267d1a894ce
+EBUILD assistant-5.15.3.ebuild 1316 BLAKE2B e04358efb7e28a433664133c45f56fb54323dcdfd50469718fec2b50279bfa17e4b3a9c8cad0abd027b4a5b0daa7d75af8344bd019cce0b9a59779fcd8a15f42 SHA512 15f55981e0f5006dbc0c76c58d3c7342fa09d41a61e8d2b84137b2385cf5307c392b54d495b1f2cf5ff7e3619f899b35a32bbb379fe79da8883f8903aef4cc29
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/assistant/assistant-5.15.2-r11.ebuild b/dev-qt/assistant/assistant-5.15.2-r11.ebuild
deleted file mode 100644
index 4fb7695223e1..000000000000
--- a/dev-qt/assistant/assistant-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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}"
-
-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
-
-	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.3.ebuild b/dev-qt/assistant/assistant-5.15.3.ebuild
index 391351fdbd47..8c494de1f6d5 100644
--- a/dev-qt/assistant/assistant-5.15.3.ebuild
+++ b/dev-qt/assistant/assistant-5.15.3.ebuild
@@ -10,7 +10,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 16691ac9ba2d..a033a61b3362 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD designer-5.15.2-r11.ebuild 1322 BLAKE2B 96e2f9396e6fa9a85c0e7428f126424fd1eb02d1906fcc64aa287dae9a03705de71c1c5a3c81348d24a2bb4c2967be9663f211691bb7a6a82cf06f3c6b0e7ce5 SHA512 41f3fc586ec362e271c5aee7eaa4c829b2e3454fb014df418e464e992a40ef0597c959aa7e5a71b811144f535530d7a2486c3b495fcb15880060e44d3798de9b
-EBUILD designer-5.15.3.ebuild 1329 BLAKE2B f6d1e4c4a373893b6eb230c8a0a659a825270e3c38fd02aa25a5a76c667bac428d301ad323a5ed67a426f2e5e8ef545598f2e9052265eed0160948592a57199d SHA512 6a5bac8c7dbb899c1e5a71e54661876f9098bae49564d1057f1e05b679652aea13e1fb12b179e8d09da2c091fad2f5e9afa4261ebb1e7c004fb0cb24887817aa
+EBUILD designer-5.15.3.ebuild 1327 BLAKE2B 1dfe125b3613bbc57d46957ca987898487599c496883852bc06a1636add78884d6676b54e16ddd3de5a31952693ecf86c7656a0fe0a436748c3dd71a36bc7043 SHA512 808d4d8655ba0a4e5ee725c2d3600a76636a55fb2a6d2140dcaab95fd7f97e6e1f0d5fdcacbd98883b992fea83d521eb410eb531cef8b57b6abebdf82113f7fe
 MISC metadata.xml 565 BLAKE2B ff18f784bf09ba4add0fe5a9966a07ba2694dd84046bc528b22bcfd643a7e57be99235bd98eca4e58f68636f9fe6c8e274aabf82ed2055c6a4c70d10c60864ed SHA512 357d80b857e508aeceefcb45ab3757ce24d6ec3e1fd67642f2cbedf496748f89ab5a9726eb974bea8d5b1693601a965571913f79b1325aeaf9020183882ba16d
diff --git a/dev-qt/designer/designer-5.15.2-r11.ebuild b/dev-qt/designer/designer-5.15.2-r11.ebuild
deleted file mode 100644
index 0d41f6d0c413..000000000000
--- a/dev-qt/designer/designer-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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
-
-	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.3.ebuild b/dev-qt/designer/designer-5.15.3.ebuild
index 32731b80111d..75e6e8635e05 100644
--- a/dev-qt/designer/designer-5.15.3.ebuild
+++ b/dev-qt/designer/designer-5.15.3.ebuild
@@ -10,7 +10,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 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86"
 fi
 
 IUSE="declarative"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index a8e28516d37e..5780a1fa231b 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD linguist-tools-5.15.2-r10.ebuild 761 BLAKE2B 0a0a92dd4c3ea44dd16f21dfc172c28dea25cd70c932ef4122a65b535738cd0602e11ee3edf38a9f2b93db0f5fee71e6a0fe22e9fb6c222ff7460566fd75658b SHA512 cb25ea547ae2dbdab01cbca18fc5e2f06bc56c1aefc6b503ce2a7396eca9a2815a9dcc0f16b1fffaff727376e435655253e2357899a0abb5de4d671142c5de56
-EBUILD linguist-tools-5.15.3.ebuild 729 BLAKE2B 59a2c9dcaf43194b561cab88a554a7ed6561f80fac1b038133397e2689f0fb7f357322986fd377eb1de9028fe50ab27c480a53aa617e23ec2c545880627f4e37 SHA512 88bb7d374f6c7a703b7281828a14616b9033d32fdcdac565252eae5a1c4ca5f8e1c445f149eb3c770379cb3ad512bd96c3fac18e77c298f74fcc512427c00096
+EBUILD linguist-tools-5.15.3.ebuild 727 BLAKE2B 795252e2edcaa0744f849db27aed66b4169f8bbb9d284835d37507fb175b758aafc66447ee5013903d7137bf9f80bef7ed85be449b381ca1c89182779414fb0e SHA512 fd808b206e007efa8aba8f904170077b0d48b0150f1233bc55c7f779ed946374a327291da2a04aad554d4fba670624a9cbafec4a2af78fc3b88abcb96c7db5c0
 MISC metadata.xml 553 BLAKE2B 0306175072e5a0abff04f61eca76aa56daba272d1308419efd9ab80c4693eb795012b4e45a4cc102f6a9ec842105a805d9c5e75f84ae8007508a4d7d807d444b SHA512 d1edc09cbb7d757cd72b9b3dce980e0fede2cf69a83b78a072d81aea97692cb235227213cf02aa8207f33bc4a510a63baee359d5e8669ea7e0e5268dcd522e79
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
deleted file mode 100644
index b41bec103407..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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 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.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild
index 45942ab520c6..2383fbff18b5 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.3.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 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"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 6c161c9dc6e3..f6bd8c4309bb 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD linguist-5.15.2-r11.ebuild 1069 BLAKE2B 16a610b157e34327a9a45d8377823646ad3d0cc98e5aaacfe34ff00b44b285e5d9644da3ecf05c02aeaaa7b2172e5ca94e6c0bfee3d7be0f757e42089f01a345 SHA512 b3570d4edfe75427b23ceb1e2b049018cfae3441c66413f5c0479e354652ac45edc7432562a9d984637cddc0649d2324d218acc0a225e8e9b68427056308c316
-EBUILD linguist-5.15.3.ebuild 1117 BLAKE2B c339c1dd5ec6fbca5e5bad0da1020e3a63f7bbc566b05892a280348a71e60aacd5c6ca9ea79794a9afe56aa9d4925853fb28aa9f1f15cb9b099dcdc289661bfa SHA512 76c2165f1c70eaa8ac561fab7d84b3d7e5242b40acca7fd59447c004cc8996e98576c3fa73a40cd42b651d90a467454c081799068f14af36cd9c59cae8171c77
+EBUILD linguist-5.15.3.ebuild 1116 BLAKE2B e229f5a67cf862235b4c43fad5ee5be8a18425f80b87a4cf744dc4fe0d4ea3b541f0610f9f3653a4181a563e1282f6713c8731ba0b33304b5329a52959f7527e SHA512 e27c03aa00b2d1d1055c56ff0177a4d1bca45d4756ec2aa07855de8895e1b0a5e08bffcc0bb565a1f30d849abe91c1997a1e51cdedb2b2fd94a5d596b422d7cd
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/linguist/linguist-5.15.2-r11.ebuild b/dev-qt/linguist/linguist-5.15.2-r11.ebuild
deleted file mode 100644
index 686904fe227f..000000000000
--- a/dev-qt/linguist/linguist-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
-
-src_install() {
-	qt5-build_src_install
-
-	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.3.ebuild b/dev-qt/linguist/linguist-5.15.3.ebuild
index 2a02cc1c6f5b..1c62ca1e648d 100644
--- a/dev-qt/linguist/linguist-5.15.3.ebuild
+++ b/dev-qt/linguist/linguist-5.15.3.ebuild
@@ -10,7 +10,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 be2b82f258bf..8f39ea50681b 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD pixeltool-5.15.2-r11.ebuild 517 BLAKE2B e985bd5d8d3ed90835a90ac58e6a7751fb01dcffe2b26d0cfc8ebe3a702a46db596ef5fc04c76095ae582a567a1642845f0bf14075bcc43c44f18753d0f4320d SHA512 83148b3fe154b1961da83e4583558ba52659ac7e32b494ada961f64d7519bb51b5dd2828d044c5525bb0501f21bb8b971a39382b85e51f46d4cfcd16f1eb16ef
-EBUILD pixeltool-5.15.3.ebuild 608 BLAKE2B c212ff044bcf277ca2732bc7e8c892061d00b539db3e6bdd759ad9cdc775bd93df51f61d265e3f172efb991184db9b34e43260a8529e1a50048298be67928705 SHA512 f13bfa182d12ef9744a596062dfcc97b0aec0a8715ad41bffb7cc8c38d2ed23d830b547520607a88ea05f2747d711431ac374b413fdb6933b932556a620c0b7c
+EBUILD pixeltool-5.15.3.ebuild 607 BLAKE2B 76524be4fa072866df788ddd11de0392ff004d509a5137ac003dbfdc52280008c174cee2b9635766d2825ca05c72418874087ec9c5aec191f062cff2266e231c SHA512 a085561da318b762f079661e39b497708271893e144a28d33dcdfbd77cc7648c30db04d980ddffaf210b16bbb78e916fac517a5a0ca51c7b84c6a9125427c569
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild b/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
deleted file mode 100644
index 3e456b213ccf..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
diff --git a/dev-qt/pixeltool/pixeltool-5.15.3.ebuild b/dev-qt/pixeltool/pixeltool-5.15.3.ebuild
index be81c08ebaff..13c14af80e08 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.3.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.3.ebuild
@@ -10,7 +10,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 8fe05797e060..f02a489a1941 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qdbus-5.15.2-r10.ebuild 550 BLAKE2B 61c2e4a3de7631511a6ecb2f5d1cc5b05cb72ae547c9bcb3b16d93180ad59283ce07c37a05b3d712f418752f04c2dc26ecbebaed4d058933456cadfebb1a6ab9 SHA512 7c031f9e9a702d622b2d13a86bf39cff64263c29dc21662ea0d7d5793bcb746c2a944008394df51eda40c703fcfcfe7872607804a8e8ffccd7c8a10027752a1a
-EBUILD qdbus-5.15.3.ebuild 638 BLAKE2B 3dad408acfc1c6fec18d8b51fcfb4e5d21f2ce82bc5ae93b58c84cae9e3990fcce8c7f65f27e1d855fc084fa43dfec0e1621f16d22b60f5c4b30b5070da97ecf SHA512 a446ebb7d0c09369e0476e224bc2101dadf2dbabc5a35efe0b0f5ccdac23cdab3431b69a3459224e7ef930afd3b7743d3faff35bd34b204757cddf1ad98ae535
+EBUILD qdbus-5.15.3.ebuild 636 BLAKE2B 35ea6b408c4fef0b9cb1a8420dcce4ec6b98086c891a6185f8cd89c878373a3ede7e8f5b82a19fbc45a6e2c05218c75bda00b66cf35a02e45b0fd91bbedbf99e SHA512 c74626854e828fd4e82937e79e564a35f2372a9925f2374d65b510ed62fc9c171f75519b19e357e9ce570cde7d6b9bb2a90b8c883010115a5968852b6a4d8961
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild b/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
deleted file mode 100644
index 2c7623dbaf80..000000000000
--- a/dev-qt/qdbus/qdbus-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbus/qdbus-5.15.3.ebuild b/dev-qt/qdbus/qdbus-5.15.3.ebuild
index 3ab10046ceec..cb0227d126df 100644
--- a/dev-qt/qdbus/qdbus-5.15.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.3.ebuild
@@ -10,7 +10,7 @@ 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"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 452ac9e95e91..5f756b769163 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qdbusviewer-5.15.2-r10.ebuild 1041 BLAKE2B b967aba8b225e5e9a9bd36d1350445b48a153342a96828771e86f23b8063878681413ab63799d7fba07850691d03644027c222331503d3da35c06f00ea986564 SHA512 0014aebe0181579b471539204c98ca991163fc6dadaddf798a74d4f47d955713388c200861f091ce9a902a4fa1a651fe23e168f9485a4229adc938cdf7ca1e7a
-EBUILD qdbusviewer-5.15.3.ebuild 1092 BLAKE2B 438895e0a98b425aadb55119c8c4d53af1d34417fa6f9504c177ad0e62fdd65a9a47701f8b08af2c25e36a1925b2d442093c4b974b8cf4917b7eb1b301c88b41 SHA512 a40df191931a873a934fd3890735b4b0c41901061ceda1ba0fcae6365ea0bc9777752a8a500717a8577c5bb48216a0598a22fb60353878197a8ab4dab5fa55b0
+EBUILD qdbusviewer-5.15.3.ebuild 1091 BLAKE2B 987e58e614cf3ba59f185925333f671e1bee6d2dda6ac7658bfc0a4c4d0072ff05d74082735c4cc2f8040073bd80d3c4f9f57e5ce67bc3d3793bf59f28205d86 SHA512 82f7c7f590c95540e7eef391a682d2519776da3af65f2b00069cb48b3f013ca0633a532972457897b0f7fcfff7575a0609ac0887cc52822b51faafcbac4c6f81
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
deleted file mode 100644
index 11f5c9a1d50a..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-
-	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.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.3.ebuild
index 2a839a5f6e57..1479b2f5a0a1 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.3.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.3.ebuild
@@ -10,7 +10,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 f1ac93ecd304..0b9a720e1943 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qdoc-5.15.2-r10.ebuild 884 BLAKE2B 9e2fbd20d3e8e17452f25dccf0ac0118e2658a9a71d9ce38bbda5edcd9284daff970419d1b836e1c06e26dfbe61f4317aad2b829709f0f8c34a7cd5d9746938e SHA512 a6ad4bfc07d7a8d1a7a739ba2a4e9a088744e2cb2fa4af4b3035ece210a00d22cbfe4b15d556ff6e704906a09fcd587d4af65483922d7541a71f99869f59d4a5
 EBUILD qdoc-5.15.3.ebuild 850 BLAKE2B 3f867eaaa673ad85092060b27a5da4086ebda12bde6a12d48de936991d84a7488d169dcb636638c862e6a37bd2e048a90941395889d4840d711d007bf8a40b3d SHA512 faa5cae28f36f0d75da34fa8a4a6b1990d86968e7cf481ea075147c4bb6819a50d0771fdf3c5c50ab5bb1032409c2d40edcd88159113d0a4fdb519dd430002d0
 MISC metadata.xml 553 BLAKE2B 6512e790088d4b7a76a22edfb8e278399315d3136239d5ea1e37ba5fcdd761fec2a1a30504882e7660b5ced6d582ad37cb9cfc68775e8593d638a4594f693339 SHA512 40075da7d634cc291dcc15c00d1fc63debc6704443fcc0c5d3d06d227b8cf86f89884ea43eb3a1cf8a722a6b260cf9cb6cd7f88c0b14babe301e4344533d472e
diff --git a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild b/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
deleted file mode 100644
index dd6896da342f..000000000000
--- a/dev-qt/qdoc/qdoc-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 755b27491930..a0fd9f550ad3 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,6 +1,4 @@
-DIST qt3d-5.15.2-dba14d48.tar.gz 86196833 BLAKE2B b5a2333d890dab3b28d0cd1e47b217ff1bc2f772b3477650263e1754ad4e06a63d026350c5daf07e171bd64e097c847c65a8f5f6a538a8ddc9db20a8df2f7b20 SHA512 eb61c94c5438c9e68253958c0fcc60ec7592916e7fc08f723a4218bc24ce5536b25df5f46c97fd86ed19de2b0851a31779fbfdb7c23c70323338a98bbc77a650
 DIST qt3d-5.15.3-gentoo-kde-1.tar.xz 19244 BLAKE2B 3274f171719204af30272e4c20fd509f180a48bd7f179d1656dfc2d638154ed51efc0952c371e6ca707e035142ab0d1e074f4587ca47673673150265f88305fd SHA512 d453cc8eb91214165c3257fa9379efcd1f2c3e4c605895df82366006a9405b37a1222f93334e7925aebf27c5118d576e0ab1b3e24d27aef68cc51f114bc9fbfc
 DIST qt3d-everywhere-opensource-src-5.15.3.tar.xz 81930768 BLAKE2B 4ead826b786074993b8c536b4b7c8d781126d402ea55da116201b3d1ea859c83b9d46618b7705b14371064fc41d8aa249efbc5db62f0e9e88fb1424c03bc7a45 SHA512 1fa644ef53923b194efd2296c1505e2193897057774411b1bc50651c2fc4e781e427de13cdc4c1c770294a39d06f8e7360353361c75222c0eb457b560943d97c
-EBUILD qt3d-5.15.2-r11.ebuild 1005 BLAKE2B 584be35e30231c285df2d668321538480dc9e1ff831922ad55d4c9846d4922bccffc338febd6cee850155b6a0229a8dae5d7f94d55decc9beb57f9a1fb9389e2 SHA512 38499295b02fd2b1abe358ea8156de91aa7262bb04017119d7851714de3d754c1fb11731a1ea6f3eb85198c1f17f181844931c444080f51930e945b16c6c7549
 EBUILD qt3d-5.15.3.ebuild 978 BLAKE2B f8bfa7715f6332d88ac7bc7f1c442e9fefb4854ab86f6e01e17c14ee76713439abea34e4f85f106da020d1fa81980ee8921b6229b60ee3a37c64d81252aec0a4 SHA512 fdf5f615c968291535b76197b9b5d7b945e309372a21d9d05dfdbd5bb071182bde0aa6ccbc310e8b9f3b5dcb01983cc0d6476ad0927b9b06932ed218322bb76d
 MISC metadata.xml 700 BLAKE2B 3f7d01ca331e1f43b3333f86f10901e6fdb6fb8482d9d0cebbd9c5d498b2a5971c7a17fe78aefe23d31eccfcf64eaee8b581f8f749ecb6c0eba286608d6c75e0 SHA512 3f6c2d8f227760e9e14f873147fc79bc5027cac6d5dc134c9ac071fd30c7fba39afad272829f8ae446682c3a1a5ba80b056b263963dcbdf308b0f55337563394
diff --git a/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild b/dev-qt/qt3d/qt3d-5.15.2-r11.ebuild
deleted file mode 100644
index e91c1ff98408..000000000000
--- a/dev-qt/qt3d/qt3d-5.15.2-r11.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
-
-KDE_ORG_COMMIT=dba14d48611b9e9d59576172658779ab4a39b416
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 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/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index ea1e4209783d..c9d2a5893b66 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,6 +1,4 @@
-DIST qtconnectivity-5.15.2-5e9ca5d3.tar.gz 3412877 BLAKE2B 07d201a934b72aab5ec90bbe667578d7150a3e93379278a44ff63ff67568bc6dfeff075d763e544e209dd0b6d9f53ca8214f483a3ff38794252b39c8ad5e80f5 SHA512 6be16baa0f63d6b36836adac50df4b9db79ca65b3bb4c92be13f748cec9384c42e57833bc1d06a8f50575f13623965cf40d1497e5fa51f44cb51b15760fb198f
 DIST qtconnectivity-5.15.3-gentoo-kde-1.tar.xz 4708 BLAKE2B 62a24b899b6ccb73eb8ffe3558fa6451ab5d5f9d08e583c527f6dad971f990f574c9aafa56e479e528ca6e92c96a1363cc05ac6e96b8e3444e8b115b0811a30a SHA512 ae37b972a3f8e789793f66123e3ce66cc2b739560cf69676b72c50139a39b903556c6bc52dba6f73335d7ae368eb377f3cad1892a5992d83bc89474c04dc23fe
 DIST qtconnectivity-everywhere-opensource-src-5.15.3.tar.xz 2815220 BLAKE2B 0aa3124def801baaad42cfd683afca4d0388355b17232c6cb5e211a98f83fc3bef632677e8e36619b74f8a7c9f02f8999153879628f993ce858dd4e322f6f4ee SHA512 23e515e36da9fb75c280cd8edaf29f3ce7e669ba294d6c1768ccd9c9967ede02dae161a6736a7dac4aa7d8087a309d67b06ba68532684c72ca9964e6ce229534
-EBUILD qtbluetooth-5.15.2-r10.ebuild 733 BLAKE2B 49ec79aac68cb016e98bb639fa31b5cddcd6f906038df4593742f84fa56e5cb54351c00fb76ae60b5d9cd9db8c29e61270e3d197e06ab44c99ddaf934828b6a5 SHA512 ef023d5ba8ca9faabd904703a44e550de2b7cd8c04a986241011ca8c7a757809677d7a0a0022bfd2af0c256d6bb04aa63a59567fd17ef260c6e68fc1d1fb0d80
 EBUILD qtbluetooth-5.15.3.ebuild 697 BLAKE2B 89cb0cc3e265d6d11870951f3d479ed82eea250307491a0103f2bf56d5652ec8158db68aec83a7870a2affdbdcba0359459c4f9b9fff1636efe06933d1f5f22f SHA512 4f8dad6d4b73522a4761449f88b694a30293afa99e5a72a8804a4aec211f6829aa21f422ee88ed62c6c2cce67d86c7e9ab46e32ee735927d97d310a97d753898
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.ebuild
deleted file mode 100644
index e8a25918c451..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2-r10.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
-
-KDE_ORG_COMMIT=5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	=dev-qt/qtconcurrent-${QT5_PV}*
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	=dev-qt/qtdbus-${QT5_PV}*
-	>=net-wireless/bluez-5:=
-	qml? ( =dev-qt/qtdeclarative-${QT5_PV}* )
-"
-DEPEND="${RDEPEND}
-	=dev-qt/qtnetwork-${QT5_PV}*
-"
-
-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/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index 86bca9e31ea1..101f7d468b5f 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,3 @@
 DIST qtcharts-everywhere-opensource-src-5.15.3.tar.xz 4252036 BLAKE2B 38d7bb4b02aca7755f056845fa712ebeeeda1ad7c66f16500f53f98f4f82449f28725a2fe784297931ef4a2ea286acb6957aa78b0a2ea81c46a9e0e41582c642 SHA512 5f03db6d8c99f696aba0528812924c4d6d1a6b1331449c5e23fb094f9166ed1f35cd3bb98e3f17daf4a9b3e7b00b8cdc569ac0200343cd47b5de04468acf1d48
-DIST qtcharts-everywhere-src-5.15.2.tar.xz 4251992 BLAKE2B 84a683f0ef327437ce801f3b1e0622e31bbc69c33173b3a52e66191120189b6c46e5840ae72861093a9c2f37cf486494fd947a75bd40c8dc2fd54cfd0324eb41 SHA512 d16fc085a7e98078cf616cde07d57c5f04cd41e9687a26d42edf9042b4c95a837371b6b9616e7176c536d742aa9b5fc15bf3393f9f2e814ce942189ac151e65f
-EBUILD qtcharts-5.15.2-r1.ebuild 562 BLAKE2B a8aa30ada9a23c720f003323b9c50fbc2a28bbf70ca10438d468d82b4d17471d45539bee3fe2af2a5b9de3c483284b94c42482dbeb2bfcf97fcb6e00c030f79a SHA512 3f65b22256a72d1a0e87226e0eef5b9ec8b4eb8a2558a2b25be0fbcb3c57fce87b992117041b82e8d376f0f6c4d132ebfa79d0446e89a4422749012c5b1abc0e
-EBUILD qtcharts-5.15.3.ebuild 562 BLAKE2B 710226199cd0543bb76ae349a27349e0d6792f393069721f00445a6858071f8ad52309378bb7b5fee50a3abfe3f6c1523cedac90189c59543307306ae57be697 SHA512 52e9c60b65c26ba53d5b63d006eba5a4f0a8f7e0a9a23c151157ecd6cf68c937e85b679026cd451814d26f3312f4a3c1c6e212b9db3698e4cb0a0a18c3665407
+EBUILD qtcharts-5.15.3.ebuild 567 BLAKE2B a857f15d48101b95ca1283c6cdb68d633708b23b814cbeb01eff34eec69c7d0a39b2c305e0617432f81c00784624e261bdea43883c567a057cc2e001cbb86785 SHA512 8dcd738b41b0c06df9af4ddc271a980164a008471824bdb253da95f9253cd783120a68b2cc08539152852eea84b5d51032675832cc070e0acd1f57d8b8e6ebcf
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild b/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
deleted file mode 100644
index a23f9413e208..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 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 ~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.3.ebuild b/dev-qt/qtcharts/qtcharts-5.15.3.ebuild
index 308042607916..0f505dbcc8d1 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.3.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.3.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 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtchooser/Manifest b/dev-qt/qtchooser/Manifest
index 33e2187977c0..8333f03043c8 100644
--- a/dev-qt/qtchooser/Manifest
+++ b/dev-qt/qtchooser/Manifest
@@ -1,5 +1,4 @@
 AUX qtchooser-66-qt-5.15.3-compat.patch 470 BLAKE2B cba1de76db2f6399e51ac6face26056b43e15d6089a828a24eb7705715f590ba2860c09fff493066062ec39ef54e990e80af2c45512eef24e56106d807085fbf SHA512 a833d589a706800d136dc9491b795906a7a34e4cd50b0faac017d4d622408420087e1a9a5cc1ef4dbe69ae9c73571de0abaa5958a527b40b62b3de931571c08e
 DIST qtchooser-66.tar.xz 32008 BLAKE2B 1faf4a44406655621e65132289af6a8b0d23f0c1027a3b99017c3951705378bebcfbc3cb32aa59975a101f21294ff701ca6eb6ec18ce977b714a426be0fbcd6d SHA512 0c7d3588ddd7b21e6e9d799204924e06e0b0950c898dfd23088f1e7657b7f821a35579aa062658499809f9d9757e82c3c592591aa2e5ec453463929bf2b33bac
-EBUILD qtchooser-66-r1.ebuild 1469 BLAKE2B ed5257a4134828f864229b04020171fa471bbfa6b4e9ac874b59027df4dbc2e6ad794a80a758cb2a7031d8a3754f1c867138dcf7959eb7ef271bf43920c004df SHA512 9bc54b406129e04df48a2bff185024c559622d1c793c4842c4ce8d64ec0af210ea18f1e6d6ac730bbeb5c1e8968823dfb0aa7ec69da1bafeb667a5e4e034c95f
-EBUILD qtchooser-66-r2.ebuild 1524 BLAKE2B 2881e8dcfd46e7d901fd9c3a75514a705554106e6767280ab64cd5bb82e1a5855056fd38b110a52b7e853fe0352df8b95993abe8cd53df699e3d0d290b5d94a9 SHA512 942591b2a963a9fc21e294777802daa4fc0ca2773516b58d157a2d6b4e5703475bfa1ff92acde72c4c2c1aa1fcf392de8d4091f2ba27b1c227d60d16a7406661
+EBUILD qtchooser-66-r2.ebuild 1522 BLAKE2B d8152c7211fa15c4eca48919f11c24316eccdc573d920f744b76679d3145c150cefcccd19a192fe603703283c4e6507979475a1bcd8cef576108c219e2c8847e SHA512 da61fea88adc57aaf6f86b302597065373da75251c38767cfc705c0f192a3f52abac5b1b1d46708cd96226823ff9d055ba8ed45144e67e4c6e48919990913e4b
 MISC metadata.xml 248 BLAKE2B 51adf67bdc3e6c30f18cb7c177694882c71c1207bf4e6b88aa0eb8d5f6fdbaea0c364777967125219ba8ea4be4a9ad3eb41269a7139cb211ce26f2985ac103ac SHA512 c2976d1256f14d4dcf6ea53ed248a43e9b76530c19eefb0e586d64b1080b75d1f4ac17171c6c27a491ce6623d34e9318fcba5ce3f78039f21ccaabbebf209345
diff --git a/dev-qt/qtchooser/qtchooser-66-r1.ebuild b/dev-qt/qtchooser/qtchooser-66-r1.ebuild
deleted file mode 100644
index e25d60437642..000000000000
--- a/dev-qt/qtchooser/qtchooser-66-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils toolchain-funcs
-
-DESCRIPTION="Tool to quickly switch between multiple Qt installations"
-HOMEPAGE="https://code.qt.io/cgit/qtsdk/qtchooser.git/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://code.qt.io/qtsdk/qtchooser.git"
-	inherit git-r3
-else
-	SRC_URI="http://download.qt.io/official_releases/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="|| ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? (
-		dev-qt/qtcore:5
-		dev-qt/qttest:5
-	)"
-RDEPEND="
-	!<dev-qt/qtcore-5.15.2-r10:5
-"
-
-qtchooser_make() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		LFLAGS="${LDFLAGS}" \
-		prefix="${EPREFIX}/usr" \
-		"$@"
-}
-
-src_compile() {
-	qtchooser_make
-}
-
-src_test() {
-	pushd tests/auto >/dev/null || die
-	eqmake5
-	popd >/dev/null || die
-
-	qtchooser_make check
-}
-
-src_install() {
-	qtchooser_make INSTALL_ROOT="${D}" install
-
-	# install configuration file
-	cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
-		$(qt5_get_bindir)
-		$(qt5_get_libdir)
-	_EOF_
-
-	(
-		insinto /etc/xdg/qtchooser
-		doins "${T}/qt5-${CHOST}.conf"
-	)
-
-	# convenience symlinks
-	dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
-	dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
-	dosym qt5.conf /etc/xdg/qtchooser/default.conf
-
-	# TODO: bash and zsh completion
-	# newbashcomp scripts/${PN}.bash ${PN}
-}
diff --git a/dev-qt/qtchooser/qtchooser-66-r2.ebuild b/dev-qt/qtchooser/qtchooser-66-r2.ebuild
index d3bd301309df..5893c9538fda 100644
--- a/dev-qt/qtchooser/qtchooser-66-r2.ebuild
+++ b/dev-qt/qtchooser/qtchooser-66-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://download.qt.io/official_releases/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 485f45ba05c5..30bf3b869c18 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtconcurrent-5.15.2-r10.ebuild 509 BLAKE2B f6aff87eb8b0aa86ed93a9ada769ccc04db6cd4c5379db1bd601f6370db0b1fb9d3d88073cf4a126d571ceeee0e4ca4adba9a0368f5aaaa294dc6729dfbbef71 SHA512 f9f067dde6879342839e5e4ecae4c0e5e8bf99abc8aff547d3137a18257452124203ba27040394edb7d5314b162b854dc1a0b3de0afc047842166a0ef268ab64
-EBUILD qtconcurrent-5.15.3.ebuild 477 BLAKE2B 64ab24960ec70e47e8ecc58163b1fe62b3b571dfa6231e0eaeb5b28bc2922ceb37fe2983cfcbbfd6c1cc3b5149d91ef5a0b1c0fa56b1c5c20f41fa2311e09064 SHA512 580169091bcfff2d858b46b2d0145bed223bd198ff83598e6aba278239d05a76a747a1981796d2baee90be6ac007e8d250c156f238f6848178b55ef12bcfe2be
+EBUILD qtconcurrent-5.15.3.ebuild 475 BLAKE2B 71ce360d1f382ad65f401d162cc0e6d5b62d709c1bd507d6fede5123bee901be8efa0c78ca7717fbb18e404f08d5f22be70a8f5674a26ede28d7fdfb0a2a2c98 SHA512 eed18c0fcb00eff001ff33377a636a8901380e4107dd2a75c6a41421472dbb108ec1325680c29f5d385dedb1338858f017d6d5e4c400f288bccaa685285d0bef
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
deleted file mode 100644
index f226909ed339..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-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 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.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.3.ebuild
index 27001e17df9d..b21cf4ac1118 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 0488ce3d93b0..f598d6af9a4c 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,10 +1,5 @@
-AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
-AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
 AUX qtcore-5.15.3-pthread.patch 1570 BLAKE2B f484f7aab89ba92bc33861abc1a4c5fe5f15139a7b14bb6a84a02d8f064dd6465d6ad3ea39ee35cdbb2dae6a2879a824b23068b8e94d3a6ebb2e6639b11a1612 SHA512 492199fdd7f7252c9ec03ed735a015df51e8de7aa2b20b2a4bb391a133e1dd0d88ce9dbafb600071e07abc9b426a9040f64a738361b71dd891186a59087515e4
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtcore-5.15.2-r14.ebuild 2325 BLAKE2B afb40aecf1e4889e4ddb266b6798c926d5485989248f4af3565759956c93a77aad0209a015ccacb5368b0085292029c641720235ea2276849f123d698a933677 SHA512 daba0cc3491ae99ac71aab82f56666dca233c69005d600a69fb4f59b82a7c561dc84fcd8d8ebcaa96bb808488d59343abc7f3b259bb4aecbc86334032e95575a
-EBUILD qtcore-5.15.3.ebuild 2220 BLAKE2B 74f834c680f4d78f651fe49a7347e5705d8374552a82aa42721b39f0de93e2e14208742f715175751a412a87550b5eee3ad16fc9bb49e6ff67d2b33e3c81395b SHA512 02ee6c200fba07082dd92fae3edfb99c77695754286aec801cd0436b3f09a2feaa4edc4b075d416db3ebf6c5cd1421073dfa2b866ee74bb05d9f8e4002665da2
+EBUILD qtcore-5.15.3.ebuild 2218 BLAKE2B a3ec0dc1be8d59c8b5ef97e68b42b68311f1658ee1ddebf3abaef05838bbdb388eec2823e9d057222e9f0d3e4de6355de4c9c5f37678443f411fdfbb7509dd58 SHA512 19f5af7688e875dd7a029034c45a13b1bfde5d9a9fa190d4cea9cb5f6fc7d7e7cfcd237e0852c9fde15184fd6ad26791d70599905a9df976c5b6d3c562d38f78
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc39759..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
-
-In upstream commit:
-
-https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
-During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
-optional and default to FALSE.
-
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-01-23 13:37:32.000000000 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-02-09 15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
- 
-     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
- 
--    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
--          IsDebugAndRelease)
-+    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-+        set(IsDebugAndRelease FALSE)
-+        set (list_var ${ARGN})
-+        list(LENGTH list_var num_extra_arg)
-+        if (${num_extra_arg} GREATER 0)
-+            list(GET list_var 0 IsDebugAndRelease)
-+        endif()
-+
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
deleted file mode 100644
index 1c8f1e89e7d5..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 10 Oct 2020 19:26:13 +0200
-Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
- file-system"
-
-This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.
----
- src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++++++----------------
- 1 file changed, 64 insertions(+), 141 deletions(-)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index c5c70b7364..01f9a6cce0 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1,6 +1,5 @@
- /****************************************************************************
- **
--** Copyright (C) 2020 The Qt Company Ltd.
- ** Copyright (C) 2019 Crimson AS <info@crimson.no>
- ** Copyright (C) 2013 John Layt <jlayt@kde.org>
- ** Contact: https://www.qt.io/licensing/
-@@ -43,19 +42,18 @@
- #include "qtimezoneprivate_p.h"
- #include "private/qlocale_tools_p.h"
- 
--#include <QtCore/QDataStream>
--#include <QtCore/QDateTime>
- #include <QtCore/QFile>
--#include <QtCore/QHash>
- #include <QtCore/QMutex>
-+#include <QtCore/QHash>
-+#include <QtCore/QDataStream>
-+#include <QtCore/QDateTime>
- 
- #include <qdebug.h>
--#include <qplatformdefs.h>
- 
- #include <algorithm>
- #include <errno.h>
- #include <limits.h>
--#ifndef Q_OS_INTEGRITY
-+#if !defined(Q_OS_INTEGRITY)
- #include <sys/param.h> // to use MAXSYMLINKS constant
- #endif
- #include <unistd.h>    // to use _SC_SYMLOOP_MAX constant
-@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
-     return last > tranCache().cbegin() ? dataForTzTransition(*--last) : invalidData();
- }
- 
--bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
--{
--    return tzZones->contains(ianaId);
--}
--
--QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
--{
--    QList<QByteArray> result = tzZones->keys();
--    std::sort(result.begin(), result.end());
--    return result;
--}
--
--QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
-+static long getSymloopMax()
- {
--    // TODO AnyCountry
--    QList<QByteArray> result;
--    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
--        if (it.value().country == country)
--            result << it.key();
--    }
--    std::sort(result.begin(), result.end());
--    return result;
--}
--
--// Getting the system zone's ID:
--
--namespace {
--class ZoneNameReader : public QObject
--{
--public:
--    QByteArray name()
--    {
--        /* Assumptions:
--           a) Systems don't change which of localtime and TZ they use without a
--              reboot.
--           b) When they change, they use atomic renames, hence a new device and
--              inode for the new file.
--           c) If we change which *name* is used for a zone, while referencing
--              the same final zoneinfo file, we don't care about the change of
--              name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to
--              the same CET file, continuing to use the old name, after
--              /etc/localtime changes which of the two it points to, is
--              harmless).
--
--           The alternative would be to use a file-system watcher, but they are a
--           scarce resource.
--         */
--        const StatIdent local = identify("/etc/localtime");
--        const StatIdent tz = identify("/etc/TZ");
--        if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || m_last == tz))
--            return m_name;
--
--        m_name = etcLocalTime();
--        if (!m_name.isEmpty()) {
--            m_last = local;
--            return m_name;
--        }
--
--        m_name = etcTZ();
--        m_last = m_name.isEmpty() ? StatIdent() : tz;
--        return m_name;
--    }
--
--
--private:
--    QByteArray m_name;
--    struct StatIdent
--    {
--        static constexpr unsigned long bad = ~0ul;
--        unsigned long m_dev, m_ino;
--        StatIdent() : m_dev(bad), m_ino(bad) {}
--        StatIdent(const QT_STATBUF &data) : m_dev(data.st_dev), m_ino(data.st_ino) {}
--        bool isValid() { return m_dev != bad || m_ino != bad; }
--        bool operator==(const StatIdent &other)
--        { return other.m_dev == m_dev && other.m_ino == m_ino; }
--    };
--    StatIdent m_last;
--
--    static StatIdent identify(const char *path)
--    {
--        QT_STATBUF data;
--        return QT_STAT(path, &data) == -1 ? StatIdent() : StatIdent(data);
--    }
--
--    static QByteArray etcLocalTime()
--    {
--        // On most distros /etc/localtime is a symlink to a real file so extract
--        // name from the path
--        const QLatin1String zoneinfo("/zoneinfo/");
--        QString path = QStringLiteral("/etc/localtime");
--        long iteration = getSymloopMax();
--        // Symlink may point to another symlink etc. before being under zoneinfo/
--        // We stop on the first path under /zoneinfo/, even if it is itself a
--        // symlink, like America/Montreal pointing to America/Toronto
--        do {
--            path = QFile::symLinkTarget(path);
--            int index = path.indexOf(zoneinfo);
--            if (index >= 0) // Found zoneinfo file; extract zone name from path:
--                return path.midRef(index + zoneinfo.size()).toUtf8();
--        } while (!path.isEmpty() && --iteration > 0);
--
--        return QByteArray();
--    }
--
--    static QByteArray etcTZ()
--    {
--        // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
--        const QString path = QStringLiteral("/etc/TZ");
--        QFile zone(path);
--        if (zone.open(QIODevice::ReadOnly))
--            return zone.readAll().trimmed();
--
--        return QByteArray();
--    }
--
--    // Any chain of symlinks longer than this is assumed to be a loop:
--    static long getSymloopMax()
--    {
--#ifdef SYMLOOP_MAX
--        // If defined, at runtime it can only be greater than this, so this is a safe bet:
--        return SYMLOOP_MAX;
-+#if defined(SYMLOOP_MAX)
-+    return SYMLOOP_MAX; // if defined, at runtime it can only be greater than this, so this is a safe bet
- #else
--        errno = 0;
--        long result = sysconf(_SC_SYMLOOP_MAX);
--        if (result >= 0)
--            return result;
--        // result is -1, meaning either error or no limit
--        Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
--
--        // therefore we can make up our own limit
--#  ifdef MAXSYMLINKS
--        return MAXSYMLINKS;
-+    errno = 0;
-+    long result = sysconf(_SC_SYMLOOP_MAX);
-+    if (result >= 0)
-+        return result;
-+    // result is -1, meaning either error or no limit
-+    Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
-+
-+    // therefore we can make up our own limit
-+#  if defined(MAXSYMLINKS)
-+    return MAXSYMLINKS;
- #  else
--        return 8;
-+    return 8;
- #  endif
- #endif
--    }
--};
- }
- 
-+// TODO Could cache the value and monitor the required files for any changes
- QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
- {
-     // Check TZ env var first, if not populated try find it
-@@ -1256,9 +1136,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
-     else if (ianaId.startsWith(':'))
-         ianaId = ianaId.mid(1);
- 
-+    // On most distros /etc/localtime is a symlink to a real file so extract name from the path
-+    if (ianaId.isEmpty()) {
-+        const QLatin1String zoneinfo("/zoneinfo/");
-+        QString path = QFile::symLinkTarget(QStringLiteral("/etc/localtime"));
-+        int index = -1;
-+        long iteration = getSymloopMax();
-+        // Symlink may point to another symlink etc. before being under zoneinfo/
-+        // We stop on the first path under /zoneinfo/, even if it is itself a
-+        // symlink, like America/Montreal pointing to America/Toronto
-+        while (iteration-- > 0 && !path.isEmpty() && (index = path.indexOf(zoneinfo)) < 0)
-+            path = QFile::symLinkTarget(path);
-+        if (index >= 0) {
-+            // /etc/localtime is a symlink to the current TZ file, so extract from path
-+            ianaId = path.midRef(index + zoneinfo.size()).toUtf8();
-+        }
-+    }
-+
-+    // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
-     if (ianaId.isEmpty()) {
--        thread_local static ZoneNameReader reader;
--        ianaId = reader.name();
-+        QFile zone(QStringLiteral("/etc/TZ"));
-+        if (zone.open(QIODevice::ReadOnly))
-+            ianaId = zone.readAll().trimmed();
-     }
- 
-     // Give up for now and return UTC
-@@ -1268,4 +1167,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
-     return ianaId;
- }
- 
-+bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
-+{
-+    return tzZones->contains(ianaId);
-+}
-+
-+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
-+{
-+    QList<QByteArray> result = tzZones->keys();
-+    std::sort(result.begin(), result.end());
-+    return result;
-+}
-+
-+QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
-+{
-+    // TODO AnyCountry
-+    QList<QByteArray> result;
-+    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
-+        if (it.value().country == country)
-+            result << it.key();
-+    }
-+    std::sort(result.begin(), result.end());
-+    return result;
-+}
-+
- QT_END_NAMESPACE
--- 
-2.28.0
-
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
deleted file mode 100644
index 611c979a469c..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ffc9093a199a542791920b30d1835c3248920aa0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 10 Oct 2020 19:26:35 +0200
-Subject: [PATCH 2/2] Revert "Purge two old time-zone lookup fallbacks"
-
-This reverts commit b0383cbd388336f698ceeac11a4f50cdff931dd9.
----
- src/corelib/time/qtimezoneprivate_tz.cpp | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
-
-diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
-index 01f9a6cce0..eea6f5e962 100644
---- a/src/corelib/time/qtimezoneprivate_tz.cpp
-+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
-@@ -1153,6 +1153,29 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
-         }
-     }
- 
-+    // On Debian Etch up to Jessie, /etc/localtime is a copy of the relevant
-+    // zoneinfo file, whose name is recorded in /etc/timezone:
-+    if (ianaId.isEmpty()) {
-+        QFile tzif(QStringLiteral("/etc/timezone"));
-+        if (tzif.open(QIODevice::ReadOnly))
-+            ianaId = tzif.readAll().trimmed();
-+    }
-+
-+    // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
-+    // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
-+    if (ianaId.isEmpty()) {
-+        QFile tzif(QStringLiteral("/etc/sysconfig/clock"));
-+        if (tzif.open(QIODevice::ReadOnly)) {
-+            while (ianaId.isEmpty() && !tzif.atEnd()) {
-+                const QByteArray line(tzif.readLine().trimmed());
-+                if (line.startsWith("ZONE="))
-+                    ianaId = line.mid(6, line.length() - 7);
-+                else if (line.startsWith("TIMEZONE="))
-+                    ianaId = line.mid(10, line.length() - 11);
-+            }
-+        }
-+    }
-+
-     // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
-     if (ianaId.isEmpty()) {
-         QFile zone(QStringLiteral("/etc/TZ"));
--- 
-2.28.0
-
diff --git a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
deleted file mode 100644
index 3ad237c5094d..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.2-r14.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtchooser-66-r1
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.14.1-cmake-macro-backward-compat.patch # bug 703306
-	"${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.15.3.ebuild b/dev-qt/qtcore/qtcore-5.15.3.ebuild
index 5de04b73f1f6..fca2881a9617 100644
--- a/dev-qt/qtcore/qtcore-5.15.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/${QT5_PV}
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 3415d44c2f59..b1eac501a0c4 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,3 @@
 DIST qtdatavis3d-everywhere-opensource-src-5.15.3.tar.xz 5191636 BLAKE2B 40e390f95e0c7d7aa28ec3add0ee51d9290c321118a5d2165eec7b03c5dddff2db0f3804173d776a19b76192ba4e8d0893603a26b916111c434298a6204b4794 SHA512 d38150d80ca700ab33f10b50faa412d930aabda157e5c671a9aeb00e7b257573f5cf77de363e8885bf507f00ce16aa14f5a7885dd308c47c2eaad08910c44ff3
-DIST qtdatavis3d-everywhere-src-5.15.2.tar.xz 5191436 BLAKE2B 2c319d7569f4dd62711f4de23661413f6d1a19ef1653543506afcdb455875447cb84980d780fefdb677f0856075e0b1df4525662bed92ae9b6272f91112c8f58 SHA512 340b5ce1b1c2d8849b665e7bc84430fdf48e443fc149530ee132f325067f57d35594a23e3a8b920e1928ca5c429dcacfa098dadcbde63d4993f748c436af4cc3
-EBUILD qtdatavis3d-5.15.2-r1.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
 EBUILD qtdatavis3d-5.15.3.ebuild 662 BLAKE2B 16392c29ef9a10f0d33eb1d84fa058b0c658d250069c18f16568aa94ff16e0fee2211f76a89708dbd70cffcf9c22ce7c58c1746cff1ffc113b10cf08fcffee94 SHA512 88c3b0f0840c97329030b3f0090ceebcce71db5a6c9d8d4f252695bcbaba967215c19335843900f3c4807c0d618ceb00d043a5e71b35a25d4dafb46f3224b413
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-r1.ebuild
deleted file mode 100644
index 4ac3606b0fd2..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.2-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
-
-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/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 054c2eb2c267..fa43a82b8422 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtdbus-5.15.2-r10.ebuild 753 BLAKE2B e785955ed4907a22f7df6f1395318ce790b63e720b3b7b3d344e30edb24355dfd32835cc570c90e5998350c540e43fc16519eed2a3b7572e662ff4fac73ac883 SHA512 bdceaa9884ba7a9483dd0e1f8542b20c01c9dbc0de7d3b5050b4acf25cea8eff71143d32943b27d155acef204c943188f4b288e6c0940e430ec6b8169016d45e
-EBUILD qtdbus-5.15.3.ebuild 712 BLAKE2B e231ebf00912f36f094e75e2bf993c06e226f613d87f66123e32db710678a73bca2d7916717290b8abc97e3c7a343b705681f32c46cdaa2d1dec324457577cf4 SHA512 2605ebf483207729fedf7e543c16997bfe7e53285a46c013b0f830e3d75869626036b1360da1ff69d715402bb0bb36fd97729d9ad49ab99537213c03a4a299a4
+EBUILD qtdbus-5.15.3.ebuild 710 BLAKE2B 79906700516f8c279b878085f0bf9973233e72548e9d5415da6abf485b02ed4b357896160369f6de7f23910296a24f9919d5fd30c06a171d346f436e096563fe SHA512 88493b3355cd5d4e6ba7d2f874ebf1333e3137f9c33fc28a4096d6c954e860e20e340c6e1a1228ef7caba8998381e551f7d39b21ea075b01dbcdff7950c748d3
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
deleted file mode 100644
index 0d2d952579e1..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-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 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	>=sys-apps/dbus-1.4.20
-"
-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.3.ebuild b/dev-qt/qtdbus/qtdbus-5.15.3.ebuild
index 9acf392bef3f..edf49e2dda25 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 74898764f024..802589576f11 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,9 +1,5 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-AUX qtdeclarative-5.15.2-riscv-atomic.patch 426 BLAKE2B 163aecf69229482ca4909ff8e618324388f80314520671a254a265e102cdaf3ae25ab9ed64cac25bb4d04377fb110fce3f38f00660efabab5d2ee0b463edd81c SHA512 3450a3e7676b7e56a97771ecbd6c835bdb2f77e4fd0802927b90d5fecc4c55abe5d9ea2d7a576e3668d8f23d838cf7a5dd25ca77cbdad789056c0fe37b9b5a8f
-AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
-DIST qtdeclarative-5.15.2-29ee9a0e.tar.gz 24346706 BLAKE2B 5bd518a61aaa24672164fad41599ca6cc4ed7e8ab3eac56d8a38d9b0d892f92ddc3e4f7a6a66c16043d1eb29578602a91824413283fdcf971bbfaf95e0a59af0 SHA512 7964cf301f8cceb01cc4eaa7b3a5bc1e882633f61abcd250fee6dc27110baa4e32622d0b24e2cdc3874b0518c79f6f42fa1ac434535270af3b35081e663d8cd4
 DIST qtdeclarative-5.15.3-gentoo-kde-2.tar.xz 17340 BLAKE2B 5f5efae23cf6c1c3abf8d0d0594ac66ae3bf116e744626f7218d0a66e5f5598861a25e8b2d8aaec7c3dd444fa4e91de313b67b53ec624965f08472587fee460d SHA512 76d5bd8aa9f2b2e766ad4dd63a3c03b2e52da90b91cf11c777f3efd6fb3110100b358f05562639b60031bb49622fd1f4b135b6903a53493664bcbf1a0b6d69d7
 DIST qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz 21567896 BLAKE2B 897aa6959f34bc6e5a3be04d9f56d13315e6681daadb935f0e2422f551865c8c6d49b0c15c5358439155d3215c1c139fe60acf0b4a7e766e8e1ff4ce85a0449e SHA512 c0f8dba5ba9e211071d64ec9de7395925d97424be899292a83fe961091c6695bfe68395fed4b34a746a69293765122a5ee53c119053f01b5fc511f0dbf577597
-EBUILD qtdeclarative-5.15.2-r15.ebuild 1424 BLAKE2B 57a37412c09412e489c5ff9953e9c20044eeec2f8b1f9749206d194d7af903467d897ad8decbddc8f5d0f3716eb8f9b790e06dc5718df1bb747804e8879402df SHA512 3c32ec37e76dc3f4a198966e50d050f805594201dd4f05c761f8c3ca85c04ca9bbfe4177feb22fd84139d20b3521266ebb772738b86ddcb3b61cc6327f02ba55
-EBUILD qtdeclarative-5.15.3-r1.ebuild 1490 BLAKE2B ea4c02de18b06e2ba54a3535a6c85fea441783db13782fae2acf9cbd340da7210e255371ba1db01609027adf10b36be429db68c10770723110ba35e1549ad1b9 SHA512 bc8158daf3e94c1633446aca60e953caf6d2b5bff9cade2ad2973ec66c60de35b4d78ac6fd1d9f1837d2c73b98ded4f9e39ede7fe6892dcc3ce6d9593b1c0efa
+EBUILD qtdeclarative-5.15.3-r1.ebuild 1488 BLAKE2B 52a5802c5f3c9726eeb4d05e128cd11ea3db267e0e9da243987558a8fc383f3d2f79c19fea9e27806363fe6b6ac92fa2a1a5e0bdd4909af50a4af6ce20a72517 SHA512 7cedad42cfa25b749d4f2a6058f8ef1923055939fa86f85d72232d61c4f23e1e7a07ab65be4c87f31ff1dbba98d372afae410507f5543497e1e2425415492eda
 MISC metadata.xml 701 BLAKE2B f28878770fe3d7abe7d61ef71306a00ea53f3428c4002a76b484f8d99924567a640f8d091e33485bc46b9644ab1dbf34a19a3329e53040419c402ea70a6f33d2 SHA512 31d0a0f10002da589a2130c16548b36a67bc763aee5b3dbcf6b4ef815a2f0a64ee40b185867adbbc910ae99c2916e83104a91a90e0dba0e0a219e20c24674eb9
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
deleted file mode 100644
index a619f3db833c..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-riscv-atomic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/qml/qml.pro b/src/qml/qml.pro
-index 7d5a92a..01f3b79 100644
---- a/src/qml/qml.pro
-+++ b/src/qml/qml.pro
-@@ -19,6 +19,7 @@ solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
- 
- # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT.
- gcc:isEqual(QT_ARCH, "mips"): QMAKE_CXXFLAGS += -fno-reorder-blocks
-+gcc:isEqual(QT_ARCH, "riscv64"): LIBS += -latomic
- 
- DEFINES += QT_NO_FOREACH
-
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
deleted file mode 100644
index 7799ef71b7e4..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.2-disable-jit.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
-index 4b08194..224ddb1 100644
---- a/src/qml/jsruntime/qv4global_p.h
-+++ b/src/qml/jsruntime/qv4global_p.h
-@@ -96,8 +96,13 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
- #    undef V4_ENABLE_JIT
- #endif
- #endif
- 
-+// Gentoo note: disable the JIT due to USE="-jit"
-+#ifdef V4_ENABLE_JIT
-+#undef V4_ENABLE_JIT
-+#endif
-+
- // Do certain things depending on whether the JIT is enabled or disabled
- 
- #ifdef V4_ENABLE_JIT
- #define ENABLE_YARR_JIT 1
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild
deleted file mode 100644
index 3cb34cce0fa0..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2-r15.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=29ee9a0e9f02ec74153a2cf09dc63722bc273544
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*:5=[gles2-only=,vulkan=]
-	=dev-qt/qtnetwork-${QT5_PV}*
-	=dev-qt/qttest-${QT5_PV}*
-	media-libs/libglvnd
-	localstorage? ( =dev-qt/qtsql-${QT5_PV}* )
-	widgets? ( =dev-qt/qtwidgets-${QT5_PV}*[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${PN}-5.15.2-riscv-atomic.patch" # bug 790689
-)
-
-src_prepare() {
-	use jit || PATCHES+=( "${FILESDIR}/${PN}-5.4.2-disable-jit.patch" )
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
index eef88f274ee4..f632c6fb5e08 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa 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 4e578ea74288..93d5e3decb0d 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qtdiag-5.15.2-r10.ebuild 801 BLAKE2B 3b8ab840db0c237141f5bd01259871bc6771a71b28af609881839ca9c0a1c0f5ce6fedb4d2c764d2f797596ed622ef537932c6b567de5179c12ebe7ad86be1c1 SHA512 b348fcecb778227671c879937ce0da9b62cbb5c8588b44a9d6ddb3e87bdb8109a31a99f3a63fd1f8556d1ba5ad5aa3609457ee9b7430bef208e24f7047d991e1
 EBUILD qtdiag-5.15.3.ebuild 846 BLAKE2B c65ec0118a1645369066c6cea6a2a45dbfebf84c11f9247806ed2801ab40027a96e715d4f0ebb3587b1d18242893646347618972d7a271f89c6ed64f1994fcd6 SHA512 69b7c3a6df902f2c626b57dd8fa784a82283bf35e46a7d759184df3897e704ac7b65acaf59d5dfafb6fd947bfdeaa1d2369bc3bcf3cfb47b07188459c936433d
 MISC metadata.xml 616 BLAKE2B c2e815f14a4c3967140cfeed9d4266b668217994cbdbc58300e3736b428f05449d83ae6ed746bb29debaaa1ab8371a37c054d03395be1f7b66e23c3209449a20 SHA512 8747ad7226372dc06c7e6b44afa0c5cf20a7fb877974c67bf4f599b6ffafff292f3c8a2a80243f6243dcc4c158034dc731451e3af9af8790a302c43ae83907fa
diff --git a/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild b/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
deleted file mode 100644
index 34c84379c01a..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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
-}
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 3805e35f1694..e3f4ea9093c3 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,5 +1,3 @@
 DIST qtgamepad-everywhere-opensource-src-5.15.3.tar.xz 387112 BLAKE2B 63de9daa102e07718733dfd2d85aebbec214390b0f1d399013a292db37544f1eb6d55f7cc71ccd0caa14d2602aa9a63351e4340cafe4c7dc85b638ed866307c3 SHA512 6a95ed24452d4df07ce0cb6ee482a333b74559935867e32467b6eb66b3c9e6f45a09d0d2bf41f549e85400523e1bea2dc5e571ef58016544aa1f1b056b2accaa
-DIST qtgamepad-everywhere-src-5.15.2.tar.xz 387084 BLAKE2B bced25244afb2f97adb7b05dbe68021923c45083abaeec92ff405a8c65b89910803dcfe28f4982f9d54dacab616b9917c7cd04b475ac7c36e8002bb6cbbc9b6a SHA512 67f299d36f70ac3205a136117bec7f983f889b6a1f7d0ff97eb03925f4789d9d90a7197f5e186a6d04aa486880c60f0f623ab56a8bd78e4682e84c7ff6cc9fe1
-EBUILD qtgamepad-5.15.2-r1.ebuild 716 BLAKE2B 2089d55972aea42e990cf5f5695cf1e4a3821078a7486ee60afca8cde33d36ba2526aea3483f65b66c13fae3c64944cf829dcc79aea5d685f9b0aa536ed2faba SHA512 be8e5d71b4ddbdf32dc825e5d4640d961623e1eb0de05f806107c1034feb90ba12289988eedc0110a9e959347b1598b1e46ada47e50da79cd8c416e1a34e2eac
 EBUILD qtgamepad-5.15.3.ebuild 723 BLAKE2B d7e60c8426952fb74e5a2aff6d3c540c7d48d8c7a6be20d8e0ab3e58537cc089e8a1acd973c76f66c6a9ee8e047a98bf1d7d8b94c8447feba863c60c621d2c33 SHA512 9704ffd0c87d89e81f3b4cf57c1a80454865498118423822e5d62391547475d9cdf7adf2dda6edc4ac6916d4d071e1fb4f53df1a26f104cef68e1399b036903d
 MISC metadata.xml 613 BLAKE2B 02cac703ee9a9083829e963e9bc97424b58a36949b8237157976d9628f9623f806dee434e5eea3b63a1f2a4ac06509a3d0f0cd094590f12cb3b97ee09f9d6cf1 SHA512 9304973708ee729dc06cef8ac5b206a21ada747ca4efb36e2fc21007da61bfaf43947319be20b0ce73411f5eda2d13a4b226503c12b1d094d5f9180e84579432
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.ebuild
deleted file mode 100644
index fc5b9a4214bb..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.15.2-r1.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 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/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index 5b8498ba3c8c..38ef102a71f4 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,3 @@
 DIST qtgraphicaleffects-everywhere-opensource-src-5.15.3.tar.xz 14040888 BLAKE2B 78de4dc63d496bf621f31de8aa6f4a62bae3582682619db498a12ee618d422e825346f6f0dad24dd877049d4cee0fe45e975d58d4fefeda8ad2e3d1a9390d929 SHA512 500f22c3845a0aeb5900dce2664b931c177b9b8357eac51594e84bcd55949292d9001467ea317cc8bc020560cb17b56fa16e1d6fdfc8e11a869aaef8d54b6b98
-DIST qtgraphicaleffects-everywhere-src-5.15.2.tar.xz 14040900 BLAKE2B 15564a1f849520adcf5cdaecf9ce015a4143c2843e339f11b291c7799242210187336a8894fa67608c172a9f1df9695124da470c67fc0448b0d1fefe59a89238 SHA512 1620a4daa6f2afc13b84752fa92f6d603aea1f7c796a239691b271a455d6887bba87a9a07edbfe008045f051c3e71fc6e22fc337d146c1793e923cfeb20e897d
-EBUILD qtgraphicaleffects-5.15.2-r1.ebuild 466 BLAKE2B 4c54cf86c23f2cb21d2288f7486cc74b1d45c5919024766dee78d49dda2556c8d756d02eac4e85500b1687593989435680d151688bcf5500ee5fcdd09e1b9518 SHA512 17daee79cad383305e49468bc446b4163e160a44701356e121edcbbbd2271cebe28c517a522138cb804ce6961101b8932080a820b49f7285c89a4b0dfcf621a4
-EBUILD qtgraphicaleffects-5.15.3.ebuild 468 BLAKE2B 40bcec5506f59a28773b429fcf1cb215a710ffdeaa248bee9387dd831b31fb85e317b30eb8c946b79edc8f2f9c9bdaf510a0f781eece96439ff07bc5c8c774f3 SHA512 a92e32f17031b3680e530435015246463c0a60510603c47541430c9a7f6b6ca630335deff0dbdb35a76b831e11d8a87e803069f99e8a4e31a485a0fce6321bc6
+EBUILD qtgraphicaleffects-5.15.3.ebuild 466 BLAKE2B ababa1fc6f7c5e8dd0f2eacc44372cee8c6c9483a5b8ec21ce5950a14b4bb280491f84e7f168845b1c5fc658482190a4101db30a020781796279b953f30eb53a SHA512 45f3c2d3994678545da37a6d9fb852ee1d1f123d9c409d22aa1e517bf8e27a9c8fa85f94ed20a5361decb8f83d0a5eacccc496d660deca05412a96aaac6fd33e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
deleted file mode 100644
index 216671e4f052..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 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.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.3.ebuild
index 1a0a95060180..b338f84aa1b9 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.3.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 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index e6f7e3882744..e151c23d9ab1 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,8 +1,5 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
-AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtgui-5.15.2-r16.ebuild 4047 BLAKE2B 4fbf8abbb392c816e4fb2b1976d6e059dbbb2ba26c286d182a9fa60590a725d134de0d5faea7e879f25d6b4d462b7f92baa93f2dc9ffbfffa2f4184d619e475f SHA512 6a09a82ef042bda13469edffa3390d77de233ba90d82518448db794a47fa25150d6d948dfc56f9f25065ff3782aaf282218bb84546ce9aa21ab0e7d45d1fe22e
-EBUILD qtgui-5.15.3.ebuild 3940 BLAKE2B 2318e4c44e586dc73c46523cc38e2526e15e9cc3ae82eeef2495b8b010b664f8c667b50ed618fb6ce06dce61e185879ea62266d199af872b3fb06267ffb001f2 SHA512 67be11cd1f5ebba116488858c0c5d4294d1ea484c1a715c2ca5a3b013e855a8fd8854f4acb862c407e8c00991b708a6914ba6e04305c577c21dc875ec304ac3d
+EBUILD qtgui-5.15.3.ebuild 3938 BLAKE2B fb74e5a11757ff91b9f1883132236c23823d4bf5e0f441a3e9cd233e4913a5cd78264cd43d8328b47b028ef00c730a6f9361a059f5ed84d613c9ef5fca8bedbd SHA512 5f3091fab54013cf872b77edbfe54e8b68eddc931bc011afb4c5b97b8a95029d5e76c3330c1a08812e9acd94429ffefe39d6a007cf36ed4f0f1b9b102cf309c4
 MISC metadata.xml 1387 BLAKE2B a370bc2dc77b3efcca29b46e9690b1b5e5c08c5fbfcf06211c1a384c9b998517b4da4357b1cc33998d4f480f9c5481e41b42f3b20f8f72d2635b317ed1d5b412 SHA512 ffa4622291427193109a83d422ff53f373fc3eb7449855849f0f39091383abc30fbfcb88a7d53e29bf2d39e1ec1c40f7aac7433b4d7c0aeefd48983047e912d5
diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
deleted file mode 100644
index 30b5abc39759..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Sun, 9 Feb 2020 11:45:00 +0100
-Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14
-
-In upstream commit:
-
-https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17
-
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument
-IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for
-QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland.
-During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some
-reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their
-cmake files regenerated, leading to cmake errors like:
-
-https://bugs.gentoo.org/703306
-https://bugs.gentoo.org/705198
-
-From mkspecs/features/create_cmake.prf:
-
-# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties
-# functions whether a Configuration specific generator expression needs to be added to the values
-# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need
-# configuration specific values. For singular builds (only release or only debug), we want the
-# values to be applied regardless of the configuration.
-# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to
-# build a Debug configuration of an application, even if Qt was built in a Release configuration.
-
-qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease
-optional and default to FALSE.
-
---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-01-23 13:37:32.000000000 +0100
-+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in	2020-02-09 15:15:21.156219814 +0100
-@@ -538,8 +538,14 @@
- 
-     file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\")
- 
--    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION
--          IsDebugAndRelease)
-+    macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
-+        set(IsDebugAndRelease FALSE)
-+        set (list_var ${ARGN})
-+        list(LENGTH list_var num_extra_arg)
-+        if (${num_extra_arg} GREATER 0)
-+            list(GET list_var 0 IsDebugAndRelease)
-+        endif()
-+
-         set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
- 
- !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
diff --git a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
deleted file mode 100644
index 6292f2e6d98c..000000000000
--- a/dev-qt/qtgui/qtgui-5.15.2-r16.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/${QT5_PV} # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs linuxfb vnc X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	=dev-qt/qtcore-${QT5_PV}*:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/harfbuzz:=
-	sys-libs/zlib:=
-	dbus? ( =dev-qt/qtdbus-${QT5_PV}* )
-	eglfs? (
-		media-libs/mesa[gbm(+)]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	jpeg? ( virtual/jpeg )
-	gles2-only? ( media-libs/libglvnd )
-	!gles2-only? ( media-libs/libglvnd[X] )
-	libinput? (
-		dev-libs/libinput:=
-		x11-libs/libxkbcommon
-	)
-	png? ( media-libs/libpng:= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	udev? ( virtual/libudev:= )
-	vnc? ( =dev-qt/qtnetwork-${QT5_PV}* )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libxcb:=[xkb]
-		x11-libs/libxkbcommon[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	linuxfb? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( =dev-qt/qtwayland-${QT5_PV}* )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usev dbus -dbus-linked)
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usev eglfs '-gbm -kms')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usev !gif -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		$(qt_use linuxfb)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb)
-		$(usev X '-xcb-xlib')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.3.ebuild b/dev-qt/qtgui/qtgui-5.15.3.ebuild
index c49c5a34a973..724233bb4936 100644
--- a/dev-qt/qtgui/qtgui-5.15.3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 4d7a8e828caf..27e15e8f7bee 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qthelp-5.15.2-r10.ebuild 700 BLAKE2B 6f0c190fe49227e969e536444e4a431601918e7f01fa0fb551883386b37662fea6b9f3181300b1e5458c9343b9dfd9bc6dbb669d190e3da8f4dc9780bdb8c857 SHA512 fc900fcef47f69b07cb1c49d1180140539370bc6dfb545ce6dc7ac45a008ffb4d8e757f7ce1aaa44d540c7cb494a2fa8ee56540d888f6f398d1792196bf43eb0
-EBUILD qthelp-5.15.3.ebuild 638 BLAKE2B e7a9249fb6fe0a4276c79241e9fe821f190dcc8e8385f2a4bcdaa8b24327b921951511d4d9046846ca42f9e106e74a6ffdb00abba9bce3674c2e86eeb6742850 SHA512 a73a09076e3d6e4dcdf115afec823c84b98cab0c7d4474710010e6a477cd6c10611f1fcad7b7f4da4041980186bc9367494efd6213cee289c775eac154c6087d
+EBUILD qthelp-5.15.3.ebuild 636 BLAKE2B 1b4d04e4e765618d5bf5f69c2a6b9bb3871a63d6f2252bfbfe83483c7c86dbb79936abe3589665f449e01d23b554f9cb83540f58caf34f00d62572f4c4210e06 SHA512 41368f3dd72a6297fff9ef96c899ad5dd06c0234e692a0fd0a54d812488911dc1345030b009848ecab48b5894e3dffc3acba2229620ae436c8c54ab45068a024
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild b/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
deleted file mode 100644
index 94ca49f56430..000000000000
--- a/dev-qt/qthelp/qthelp-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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/qtnetwork-${QT5_PV}*
-	=dev-qt/qtsql-${QT5_PV}*[sqlite]
-	=dev-qt/qtwidgets-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qthelp/qthelp-5.15.3.ebuild b/dev-qt/qthelp/qthelp-5.15.3.ebuild
index a6bb7f7c9779..90a95aba5a1b 100644
--- a/dev-qt/qthelp/qthelp-5.15.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.3.ebuild
@@ -10,7 +10,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 20f0302c018f..12ab41caec8f 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,3 @@
-DIST qtimageformats-5.15.2-cb82c743.tar.gz 2366626 BLAKE2B 76edd4d0fc2908d466e4b7f9af1e93c50cae086c1da1144d4b8230d19163e2c43704365e396769d9ba10d48f46b42a1ce793e49686d6757790c32a1c0ff4db2b SHA512 f202f3abcdea0b49ae4f286fd50c1855c8b84d502b89f8350666828c6e29c4fa0bafd72b891513330e2541dc407d298076ffb519a030b4bb50517b5196ff9a3f
 DIST qtimageformats-everywhere-opensource-src-5.15.3.tar.xz 1811496 BLAKE2B 1d061623497c7fb185ee4ede9ae6421b6ba91ac01457d8490b823b74355c3a1e3194a762e9ebe31ce0375326efd84a626831e8fffb9ccd4af366987968b05d5b SHA512 f4ee52dc8c48bb3e558802be2f7209bd90c35b89af366836615342b2c6981c4389ddf8651b00970c49ee472e9c663434646228c24659d9e2e5591e4c8f1ff26e
-EBUILD qtimageformats-5.15.2-r10.ebuild 744 BLAKE2B aa7b49d667c1bc5c9ed3172d461d356d45d889e5aea131b46b10bf7b0c73be6556b0c6609b0df63ddd90040f0d9c2e763158334721b58cdd8fa8fe2fef8edc05 SHA512 71f01383629cdfe6c9181c7c018b7aa6b648529cf9f35cc04bdb18d5c65dcb2e712818b56d17f7fd879989a9ae24adf9abb8819761ca58f16dec08f57b86fa3c
-EBUILD qtimageformats-5.15.3.ebuild 689 BLAKE2B dbc268a4e5eaa2cf79690c938b8a3da214d53688aec641632bfd1f822aaea2a50d60637a96a637c181e962461d7ef95af22399c51855a81505bb185b03bd3cb3 SHA512 d567156ddc51f428e475562aa9592d9348111b4abd87f93aa9119fe23e9c4d3a80b798eac50eac62605d6c6af80afedbc0c4e61155f6e4609e11fc192aceb2a4
+EBUILD qtimageformats-5.15.3.ebuild 688 BLAKE2B b5dfa71a03a904c1b5f0775111ef9d69ab0341985080f204de8ebf8489137381547a351e24bef0ff2aeb1afcde261bdc16d4624887f76a8cf1c68002772b20bd SHA512 5ecdd564edcc0e4955f5802e268833651706d254d6ffc1daf88767c63267c7adbd5b3365867d869a32d3a6ec44c53e986cd5ec53c7b3f3ebab46cca014d425ab
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
deleted file mode 100644
index 5d58b6ffc55b..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=cb82c74310837fe4e832c8ab72176a5d63e4355f
-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.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.3.ebuild
index 7475abf9eb58..b1c214ed8602 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.3.ebuild
@@ -8,7 +8,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 168e1acb03ce..cefec664009a 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,4 @@
-DIST qtlocation-5.15.2-861e372b.tar.gz 5431120 BLAKE2B c66e81f7e726b53000a0f8a4eafa9a4a6168aa08c89d4d0e2ef11b02e3598fd0b3f30dbd21e6c5436814bb88fa69c96d141b0d0d79f13239ec61396269af089a SHA512 b7cac8cd42185504c6140f1dcd4e8c0c749e3d8f22bf9977e97268e0ad6fbd3733e571a255ab7824eba31e30e707e804b07317f2ec9b7be15a4a5756c78c9e41
 DIST qtlocation-5.15.3-gentoo-kde-2.tar.xz 1000 BLAKE2B bf03283153bed5f2e67cfcc42784fb6cec7574492cbc63979316602e9f2684fdd10f140b743f82076ec39e0831faa8a5a2074e9cfdf7c4743eff354e076b635f SHA512 f44f5aa2f6aac3a62fbc3cc6eaa88949d54f4238d1cbc12d770ba3b48f97712678c491083029ba871fb9eb31f5172296e8951e83a3f874ac2a8a1a78478559e4
 DIST qtlocation-everywhere-opensource-src-5.15.3.tar.xz 6556680 BLAKE2B aa187e23ed544e380516d93f3cb83fcff73ee501e7b790eb55b9ca9ddcdbf96d31b8b645b70e003423bf6e8945e2fb06be0ba62785a1ba5680acca2129003d83 SHA512 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886
-DIST qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz 3726244 BLAKE2B e571a72e041b80b155eae7d171cee7f996fbe223c8d3337f549ea2a40472fc2da9dd8abf54238f22c1828d467aaf01307a61acecd3aedc4f5f7cabc06f48d830 SHA512 6e38e5ca0b9e17de690af79f4702278bdc933a74561aa135b3e82245df7d795602403048bcc5bce00237f774ce3957540a8bded1a71f8730a08da05dec1f039f
-EBUILD qtlocation-5.15.2-r10.ebuild 1604 BLAKE2B e03e24a09ce4047332cdc6d65da88ee88d078283867523bde64b8ada59077b65e59cb22cb477065b3766b5fe5fad3f3fb01741e08f745ae54f5b0fd02d720649 SHA512 a34e5276f3a6ac15a20bfb8a5ebc7fbb7bf14d48a085d5a840a126130723c49877f97e3d6690fd734253c41adf8e8fd534a62c760abb9a87a4cdd901b99569c3
 EBUILD qtlocation-5.15.3-r1.ebuild 1152 BLAKE2B a558ff0535ab968941bebb72a42e78086be818f381c9be2e9f30457a75b9a0ca51d3a6409f358631f1b46035f1192c78c00cc2667eeb36ca6faa59318474b342 SHA512 a862db787475b9be16a35f0617d41de50584832c044e3a77b4bf01354eaa278d7eb6c4490fb3257edac9253ad685c1a3997a94b258c6793e45887424c57db199
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild b/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
deleted file mode 100644
index 9b2d0f37d3bc..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=861e372b6ad81570d4f496e42fb25a6699b72f2f
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	MAPBOXGL_COMMIT=d3101bbc22edd41c9036ea487d4a71eabd97823d
-	SRC_URI+=" https://invent.kde.org/qt/qt/${PN}-mapboxgl/-/archive/${MAPBOXGL_COMMIT}/${PN}-mapboxgl-${MAPBOXGL_COMMIT}.tar.gz -> ${PN}-mapboxgl-${PV}-${MAPBOXGL_COMMIT:0:8}.tar.gz"
-	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
-)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-src_prepare() {
-	mv "${WORKDIR}"/${PN}-mapboxgl-${MAPBOXGL_COMMIT}/* src/3rdparty/mapbox-gl-native || die
-	qt5-build_src_prepare
-}
-fi
-
-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/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index e60260c4d8e4..b39d0786ab96 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,6 +1,4 @@
 AUX qtmultimedia-5.15.2-no-qtopengl.patch 445 BLAKE2B 9224c90ef5a57b0da8c5ea5a51eb03d4702824fbb435101d5d9d559bdc4d30ece2de7457ed1bb80ca7f028a0b1a5abfa7436501d5d30c87680fb46707de17f53 SHA512 2f3dbb4dcbcedd01e3d911cf1f665e78dc08b383a5c8f2e17f96072330242e7463e6e403159f90f60b799110371ca923f502619548d5db3fd264af4298e4b587
 DIST qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz 3828384 BLAKE2B d6b9c892411d25381aa8fbb648f6989808f56cbeebb4df5cbbba87f18694b7d03de741ff65654bcb2ac5e0953c97db4a1d039887cf61e485a2651693a2553518 SHA512 8206df23a84ce77d234a97cd4847f7185d7b5ca2c6bf1cd48dc19c833a302f92f85c53d8bccd4bcfbfb6cdc82c2246b2fb62400eefd5d4b152e95e378dded668
-DIST qtmultimedia-everywhere-src-5.15.2.tar.xz 3828172 BLAKE2B 6d492abdd563788e601eba8183197863f5ddf0697c8f72939f8d6de8043d0575333bc6effd17182a2b5e2e0a93d6f431054282ad34f4ea0f0a0a67e1502a948d SHA512 be58e6934976b04707399f8525dd5d50f73e0539efd1a76c2f9868e35e6f136e0991652df5d46350a9ac39d24313353e4aa826131f268a95e458e57279f448bd
-EBUILD qtmultimedia-5.15.2-r2.ebuild 1555 BLAKE2B 47ef551cb098b7cf6156b4366b1b6d06d316a1e56a3f24a67bd69973d55b272c4ea8d5b68bffdd6c1427440b633ecd640af24bf87a59510922ddbbb8b7bdc0f7 SHA512 bd74236fa946d731b2232c80795f63c939bb19f7543594cdc56b00de82fa790b2bc9f0a88871b486857da8c0c4611fbfe28d2071ed67560184263ae6d94cf46a
-EBUILD qtmultimedia-5.15.3.ebuild 1557 BLAKE2B 862821dd1b7d4f5233b68ab869529ab0f8be10f6c396029d16d14d9643a2922ead11ba09eb7a69887eac13faae29c652b05e8523bb3f3ec47bd17391c7f0f730 SHA512 ecf7c39a685923c248688168f67f536898779c86e7daedf115c8bb2da8f1ed723b128051fc8f64eab5bd03e934db3b3a56cc0fa80700158dbbe31d4f36bab9a5
+EBUILD qtmultimedia-5.15.3.ebuild 1555 BLAKE2B 1581096539ea2ca42e4cd37b195887793608b7395b42a42238419f94797b18545fa08a41d9d6e65a2ccac56c6e14e91bf0c3efca232ffe02251f5c1610b3bc7d SHA512 52ac518e8a09f846ba349c5104dedd2f6d4a63dc0b712f77cd228c790ee3ae50c728ddb68359d03ee8d4a199da594fc026b69684da2b48b9e6a1a07a8ed66c11
 MISC metadata.xml 718 BLAKE2B d3acc9acd94e1da1ab42aae7d809442769d2d5896aca86124daf5e7d9e7140d98f3898809266fcc2aaff5eafa333e90f41f333b2615a558c1cfb52020a452d6d SHA512 ff422b18cf9870677a9cfc7c9f89b976f3c4e3bd16ae5323ee380f3804ea0ff1fac9054022ae9d272e79454c893cea31961cde5bb4d2fc4ea1795e85614122db
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
deleted file mode 100644
index 54ae53fe2eed..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.2-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.3.ebuild
index 0ae0e64ad44a..a3b1de4be514 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.3.ebuild
@@ -8,7 +8,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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa 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 d3ee0446fc30..a7d798cfc847 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,8 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtnetwork-5.15.2-r11.ebuild 1661 BLAKE2B 72d1089771b6546c2425872e547420e7c4326af64b21f92b7008633fa36e7cbd0f064a339f486ad7ebcfefac76e136242273b9b902aacac92cd2fc1933a1af15 SHA512 e08756281594e069079dcb3fa2688c93a42a30f3efec0f7cfa1662edfc2bd5b444db75be2f47ac341192d44fef3610692eb76f2cbe048c2a2cb48756c52daa25
-EBUILD qtnetwork-5.15.2-r14.ebuild 1640 BLAKE2B 753822b63518b515e42437ffecc166b27e17c1218fea09bc98ec3f81d21bae155bb07bfebe88e5e53a2e9cddcf5d1591f0b9dd2db2d623d31a70706b7df037ef SHA512 8f8f428dd8532ea1dca9f4c35d371e3cd62952e2da66f57485c829eb08fe259e9f4ccb3d652c4bfc90249febd49a4117d68d92b51223264154160ffc9e4335da
-EBUILD qtnetwork-5.15.3.ebuild 1608 BLAKE2B fca1e154ce5ccd9ea8443dc8f4f82bf99d338d483faa43215c3852c0c33279161baf58084e520df8567877a12463b3b537c000197df5037e64e35048e6d4522f SHA512 cbacfb567535fb3710fd82480081d10cd2fb4635e0840480852540e9bab44479f145780aac060719c95b35222ea52728b5f381b60faa92d3870f286e6132daed
-MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1
+EBUILD qtnetwork-5.15.3.ebuild 1606 BLAKE2B fc28d77ccbcaa9830262913af3bd344b006474591271f0c0ba8f73c73d68e5f678a997382022b5d9ae11e582ae56dfaa5c5f379542f81137e7c1fdab92abd2f4 SHA512 027d7e2f023e5027cb03f84a09d740eb23d3e2ab495cdc48b6e07cacf359b1ab9958c3eb6f53deb0ba17ce0651e2ad818d648b5d7eb12fdb982a98ac3d371eb6
+MISC metadata.xml 877 BLAKE2B eefc4aa477bcc6ffb2a2fb0711861a9bd7c79af5c5febe0205da57a3fae7206f3ae96dffb8b57e15dfe2f1e26891691886e02984654556d3d53a269dde5ce757 SHA512 dad0239dceb378c1ad4f52c287fb5d61cc248ac533a3df3673b30c0f332eb5cd3a34255052afe2a42084bf1c1d6a1ee501723e43eb268ab5e215fb37f90bcf36
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 5e81d7dc838d..8a8481b49e8b 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="bindist">Disable EC support via <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="connman">Enable <pkg>net-misc/connman</pkg>-based bearer plugin</flag>
 		<flag name="gssapi">Enable support for GSSAPI (<pkg>virtual/krb5</pkg>)</flag>
 		<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for automatic
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
deleted file mode 100644
index babaf742b4c9..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="bindist 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=[bindist(-)=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(usev connman -dbus-linked)
-		$(qt_use gssapi feature-gssapi)
-		$(qt_use libproxy)
-		$(usev networkmanager -dbus-linked)
-		$(qt_use sctp)
-		$(usev ssl -openssl-linked)
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# workaround for bug 652650
-	if use ssl; then
-		sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
-			-i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
-	fi
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.ebuild
deleted file mode 100644
index b74124fe8839..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r14.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
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-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.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild
index b439e11133b7..e34cad6a77eb 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 476f35332a92..48492e4e065f 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,3 @@
 DIST qtnetworkauth-everywhere-opensource-src-5.15.3.tar.xz 141748 BLAKE2B 71b48d66be1e4ccb731384bb1a7cfcbff964df78d20ebca49bcd89f50a5fe7d65a786d3c6408a897c379129c1fd84c45bf89780f253ed46badc48e2f3303bba8 SHA512 0d155fe4b50a412153a4da8423714aabaf24bdafa0dbe789a33c18b4111b0641c93dd0d5f31774c8ff5ccc0737cfde7992d8181a69d12c93ccebc7c65c5a1654
-DIST qtnetworkauth-everywhere-src-5.15.2.tar.xz 141688 BLAKE2B dc850ffb257e2f2c8ece0d8676cf91454df49550883548206d1362946d09bd0ddf74b2a73ea4860c1cbf68f59f0d06312a7d21279f1401bf27c11b66341df95c SHA512 94843a74ae188eb0eff9559be6b246f61f87104479f6f52fe943b31a9263461a7051d967072d9061124b2bd056d7265645892104653c93dfcf68b11521f1c33d
-EBUILD qtnetworkauth-5.15.2-r1.ebuild 395 BLAKE2B 25fa46a71957920b64c2dc7f978e26f18ecfbcf4677340e89824294be0a4ba712a46132a956e4158da377259d435f68c644cc674a04103ce2e4b18aa38f2176a SHA512 f567f95f47879de36f2a9bc689a892f0312bfb956b7cf0700df333538452b790c0fad44a6d8a7b796a1a9710f96d4e681b0c6fd8201226ab29b054425d79cceb
 EBUILD qtnetworkauth-5.15.3.ebuild 402 BLAKE2B c8ca356b8863d197ec4f0a0077f28780fcbf03a22145d6cb3053f6b7739767447046ca98b89644fb5f9bba95cda67b0a2e9b9f0a1552b91d46d66d2e017d3f87 SHA512 8da9b85349bdf422963698005eb44a044cbde09fe18d6710e17967ae378c86babb43c5e4fe44b8301d187a687f413e81d7597eb9a53ef63ef594f2e2c627aa0e
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
deleted file mode 100644
index 427cf618df8a..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 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 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtnetwork-${QT5_PV}*
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 292485d4ad0a..811eaca7b89c 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtopengl-5.15.2-r11.ebuild 720 BLAKE2B 8239d955e885c821f56afab690a27d01dd49313b2df705bc61b6aeaf8fb921d925c7d6c7255a7dd4cf0a667c92204ae659792802bb904a7661da8331d644b5c9 SHA512 0545b133c3a5362300467c59f1094fc74cd70688d6a1b02a797e522f33cb6bc5ea2d36202d8414c7f4e806872e337c821e0ff09a9cd712430aae57ea5eb3b80c
-EBUILD qtopengl-5.15.3.ebuild 688 BLAKE2B 78c1a3b5567d6f9b82291d3ae2b3aaf3f98514a85e4162505990c0c62154b1baecdcf9f34fcd19ae467eedae4bf08bf8572a22d674b7286059f524d6b7e9c1f2 SHA512 25a506d45a70f073d719d6ab342a5d0dd9ec67d8feeab4761ca3355070e7729b51aa111b6754d431be7de6cd6f6751bde59be88bbd2b85d8ae896a255aa7c966
+EBUILD qtopengl-5.15.3.ebuild 686 BLAKE2B c2d82b9f170fdb10a2080503bb37a7af1390de81b52d6a9701b29cc49cdbeb72d3c589ad176c2800fc7b9270a41f1d0759f9c59e904b622b7880303bccc2a2a7 SHA512 d8ef406bbd81743f529554bf34eb1cafe8a2818459c8a4e39521722eee50b37a84c5685f1aa08be5dbc5a086b9d12c633fca0da9af8bd368862dab8e566a3d84
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
deleted file mode 100644
index e665ed8dace0..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-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.3.ebuild b/dev-qt/qtopengl/qtopengl-5.15.3.ebuild
index 5c09985ad0e6..a250eecca415 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="gles2-only"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index ac9fa462891f..3daff4e07575 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qtpaths-5.15.2-r10.ebuild 477 BLAKE2B 1c37b6d6dd530f11de42903f7b263f4998e94a89005a128de29cb11e805a0feecd95db1b514945b6c2e3fef3f0b06633e56fb394d8c7dbbb9db3eb2fc2fb02c4 SHA512 f7b8f09e193a234dba405f060447d2e9052f5b6cd28793c6b50c8ee07ace08bb8e08d84231d0a34f447a6ee5a43feab15f220c1da42adfdd047d98369d355d65
-EBUILD qtpaths-5.15.3.ebuild 525 BLAKE2B b1a474cade0c44505db8f8c794bf26045a16af4fe069fe450a3e6e7e329c2ff63f121efce83dda9d3e88dab89c7ddfe6a4a57203bc693a60bd4d615cee986b46 SHA512 b4498ad80c73e477782283a6498635711ae085fed6450370aba6da0058e52ad07fdfcb78a7fe8b7d3d33400238d324c06e7133a4991fa2c84639273839309fe2
+EBUILD qtpaths-5.15.3.ebuild 523 BLAKE2B d0209104e2b9f442814465eeef987fb756be45c35818bb447c817498582ed5bdbd80b8da9163fe2abe210388a8885b4802ae68da726a2428457717fd9df785ba SHA512 f99b7d6333d09fd917bafad2fe0da0ce46ca83ad6d818ad035c7a86568a78d091d956ab64fb8743e48e65645c074a42ea6ebed5bfcc610c1c8d75a308f8a2fa9
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild b/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
deleted file mode 100644
index 1d79d126f610..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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
-)
diff --git a/dev-qt/qtpaths/qtpaths-5.15.3.ebuild b/dev-qt/qtpaths/qtpaths-5.15.3.ebuild
index 23bd603cadd3..89d6076a809e 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.3.ebuild
@@ -10,7 +10,7 @@ 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"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index bd966f4a41aa..6c1a6c6e1f48 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,6 +1,4 @@
-DIST qttools-5.15.2-33693a92.tar.gz 12266718 BLAKE2B c519abdcca9df3b191297b859b2dce417ee9a79f9e3bcb3f2aa0017266b8edc855645108f5f7e6853d28f4c7507c92646ce8130731a345c6ffdfcd37fb1f4789 SHA512 9a62f1849c8eb65384d19de61cb6a08d1f467877181fd752e58b2b4e7d566c5d868c7ebab2d01591c6f540c01c705b7f8e0fe76c26cb0ee78f590ddae57048d2
 DIST qttools-5.15.3-gentoo-kde-1.tar.xz 1472 BLAKE2B eb4f5555127b91767a06c126795930a8331b8431e77dc6c689098dd0249dc324bec37f2f7e816505cc41fd9578d62110a41d2d064b3ca509a56600f967c31690 SHA512 5572b228cd80df8d49627bba4078943eed3e284de53336608ef7c2db36d6f9fd03be0f6060ccce79c59ab439650125fd59ad7d8ae16a2aeeebe4702f7b7f9354
 DIST qttools-everywhere-opensource-src-5.15.3.tar.xz 8896764 BLAKE2B 65a5d67a5f1c00c244ed91baf24ca10cd2e371963c4f55b3837701d71859b7adc03897db2021040eb08b85eb0f5d353bc8b9d7944aecbeec64397f7e0c20735f SHA512 3c4ffee1d67126e3dd10c1dabae3660b94b97541480814b77bc88c0eaf86d8d43324d582465521fbdbd49dbb4155561f93e91c998dc1ad6553da02a3fcb0da47
-EBUILD qtplugininfo-5.15.2-r10.ebuild 432 BLAKE2B ee87e66ebc299d7348a1af578483339ad35dc53cb66cdffc7b380af96b30724631c5b12642f95d7fa9d1de4fba5f4d914e8db1ae237ccf834e99b928671b49d1 SHA512 44c7621a2658a1cb0e4101aba4978ffcd2fa4fa784449ad802b5bbb971407b077a1b58601c94518c24b93a1efcf76080c2a3afccaffa4907389a8052e17381f8
 EBUILD qtplugininfo-5.15.3.ebuild 398 BLAKE2B 7fdd6e74ab00df62a0bc33895871aae2aa00b6e1eadc294b97c2bdf6c4f8c6012b930dff2273d59ef620dcb0202fe96ff5c8314ba8d3a73a9dbae9dce5da80ff SHA512 5d477fa7b4aa26c3476e4d297d6138d7b7cd2b71bff9a0a17b5aa5835497ecf166e5e1b1af58a35a7836507a2a7fb6a71391f1fa57bcddb7a4a2c2e10a35f2a6
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild
deleted file mode 100644
index c08f8306e509..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=33693a928986006d79c1ee743733cde5966ac402
-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 75c16aed4fab..a91e36383038 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,3 @@
 DIST qtlocation-everywhere-opensource-src-5.15.3.tar.xz 6556680 BLAKE2B aa187e23ed544e380516d93f3cb83fcff73ee501e7b790eb55b9ca9ddcdbf96d31b8b645b70e003423bf6e8945e2fb06be0ba62785a1ba5680acca2129003d83 SHA512 755434db4cdea1c98159a2891c3efcda03fd03b144c37e7a71f57cb5d5dbc5ea1b35d1dcafa7301fc904ede910b4a9f7cfc834b7722cc06fcc360ad3be7b2886
-DIST qtlocation-everywhere-src-5.15.2.tar.xz 6556764 BLAKE2B a322f35ece266fff6428da9090f02c0d5749a4750ff0655ef09695f147d88d667b5917335e44d0f8721cc56f425c171fb11d0f34342aff005327518e9c1d6db8 SHA512 6192922506b3ea354e85431df83c19d7cc9aebb17549c6a1de48f625bf8365ff3db3161080dde254a5fb9199d99c3c5dc8e1533429150be55df96ddb7d6ce16f
-EBUILD qtpositioning-5.15.2-r1.ebuild 870 BLAKE2B 8f9eaa39120b41d77a7f1a0eb58486efa46e29c99f4c6a19718f327fc8c76a066e5410329bcbef47605bb18bdb93bae35e7c014cc7a816257983e25dd7ea9921 SHA512 e908ace9182c6e5cc37639d42d21ad862cc71d56e6c58361e7bda324af40105edc5de2fc6db6290f1b9d81ee655713552a78190ed7ca0f2bfde46c0413c1fb9a
-EBUILD qtpositioning-5.15.3.ebuild 872 BLAKE2B f8109ec5f455301e7f6505e3fbde24efc8417bba2dd3be128d36269824d67a70e8e9dce5ceb2fa51d7299497b8eb3850508a38cef11144a75ace308f5717b207 SHA512 dd877680041577dd7e036bcdafc04f696c116b6f0f58599529dadfa3f8e80f3b318c0f5c6bebf2e74ed4f22e8bebe95c6f00736dad2c504ba6b7b00e92cd08f7
+EBUILD qtpositioning-5.15.3.ebuild 870 BLAKE2B 999d8763bcb4e6f76a7620214c7038fab89e3023baa5d887604ca93b9677e273707c85e9d07be45722e6c08e074d9c357684324200c273d5a4f270707c5b7edd SHA512 05333d0b413afdf112f2dec4a624cb04c9726fedf8c94bd35c4412185fee98c106f9f3de7d9f0e4ad0b740392972d64d76dd813c068ea45adf5513126d3ce0bc
 MISC metadata.xml 639 BLAKE2B e49b21d1ca752b501e8fd6421e3166f490fd5b304ad04edae73db2634189b63bc3ee321d358ce2ca1b412ec0c1c608327aefc92658b27f28f5ff15b2e41fe31b SHA512 275f24bb9566eace9bb35aea94925088131784b094835fbd4cdfbdc050ec9c411091fa73496de59d28a5d137986a0a6b4ad1cccf06db2e72fb86f31da6b1cc10
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
deleted file mode 100644
index 6154ad6744ae..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 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.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.3.ebuild
index 2d39fe6d9bd5..dba8769378b1 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.3.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 19980886e5d6..6bc259f9250a 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtprintsupport-5.15.2-r11.ebuild 866 BLAKE2B 51095c5e1ce74a10fe5673c755360402f440b40d34d197560415efb5bf602a1bc621cdd9e8288c57285ec1820cfe3dcdd567d47246326fa97ee3b5d16db96f17 SHA512 e6b693f825fb453f38a7638534919910dc8d1052a803b75decb45ed24239074bed562a94862fddf6a95c1215f3dbcd6487ba910ae6f61dc299ca83c3ec904a7d
-EBUILD qtprintsupport-5.15.3.ebuild 828 BLAKE2B 6039406cebb135183b825f1a3700b8cb7606bf98eaff972c8ca20029135846f03013a5d9bd0ee273ca366ee74df20497430665d8d9dd810da9bebe512b844870 SHA512 7e428573a8a7d5aa2c3ced595a156d6217f59254a52ba25d84e70359cfb35e485d7ae5a0287ca07b2326f5fa5375d06c8acfa1722dcc7a159016eda13a572e0c
+EBUILD qtprintsupport-5.15.3.ebuild 826 BLAKE2B 15904b05281477fadefd40f9720b8ad74cfc9c990a9390945985aa9750556bd3e41a6f7eba9b7d72656bb1ec1df75ce833945aca3a2194ef7a3c5f1228d439cf SHA512 5fad2e5a78292e52d082b31c45355de9198f2e40384ac4cc25e6bcaf692de6b542c7207186aabf6ec3fccc59c17f6116eae6443d077e919087822f4c7938b357
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.ebuild
deleted file mode 100644
index b84d29633c0c..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2-r11.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
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-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-1.4 )
-"
-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.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.3.ebuild
index fba3716d024d..16fb8af56cd9 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 0de80ff96d22..5bf8df232d90 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,3 @@
 DIST qtquickcontrols-everywhere-opensource-src-5.15.3.tar.xz 5982868 BLAKE2B 62a9f972b744f54d8799587c915312797caf91087b8724081a0e1ce1a32f034b237e02db4a0064734117a4b0fede70f94f0c1399b9c3835250a157706899e7e2 SHA512 756bffb68ad3bd7b6f6c91dbf544e19ff897f8b97ef25bd5da7f9acf8edb903376776ab90cc1b4cf3a0a73e7be37bfbf06e3bfc9afd698aab83e27945c3a5b9e
-DIST qtquickcontrols-everywhere-src-5.15.2.tar.xz 5982344 BLAKE2B 425bf2841cf12dd636955abeeb520dda580f6b509c01562192d8f2c91d7a9c32349992cbb9f0c1f84a12a98c135656158660ed2d7b21fda204927d0c5255f708 SHA512 52839e7442f4b6b5cbbb741d29ce28e9d2d9f5573499363d17252b166c1f318f37a19ecf1bf17f5cf6940bc29cc2987180b740ce036d924ff329dee9c37823a2
-EBUILD qtquickcontrols-5.15.2-r1.ebuild 765 BLAKE2B 45cf85d9840351cf6312ee5811eabc4dfcec2516a67d9b04bd451674c4f2d301c058209bd1605510c1721ade0f6a5aef603eb3d0e3ead4d1e87cea433d55243b SHA512 cc30a6858cc250b5a31c75df36a47e08dfa6684190c7aaf5fb1ed264cb2360d65592eafa2486b3286db10722ea758bd15c014f6413128ff52fa3b26042db782a
-EBUILD qtquickcontrols-5.15.3.ebuild 767 BLAKE2B 2efcab4bd893559d53effc30ef2833dea27daac515d49fc2436b9d02da7a27774d62e132eb0b3f5a50235056d6540ece39455041be09b99a068090b2208e4b94 SHA512 f8ade80c6c96e19cee2ec4e0c79a73ccdb337f3dd6c0aac1afafe329502742c194d60fa3514f011d11db2db4b0f4613d3cf27bf54f40ef877d92b0f8ba19bde4
+EBUILD qtquickcontrols-5.15.3.ebuild 765 BLAKE2B bd853912661473ae971ee766b7898061dac95ef44774e3d9171ad2fa87b20c599a4b42cb4e0b5e9371d117d8d9dcd110a07f37756dc338c350ba85a5b4a3f74d SHA512 cc48bbc736550e64f7fdd6b24666edcc6a14d04ecbbd5b1b4a374e5859246901c7b3116eb2bccb0f016ad88209bdf61106178829d8c35aa2b6e8b2b56928e781
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
deleted file mode 100644
index 494d453b030b..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 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.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.3.ebuild
index d42984d99e89..992584e955a5 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.3.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 ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index 168e96776c18..ca0b6d1b084b 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,6 +1,4 @@
-DIST qtquickcontrols2-5.15.2-d8d6b14b.tar.gz 9243417 BLAKE2B bb7ef475b555f50b056be7b12196180a87bc59b64aa8dc7fb857ca532eff1f611dfc6c921c451d2ddd23a3b435689ba8a651f77db39d2a7d23f8e4ac66394c14 SHA512 d2e596746b9c05331397b290fe2e810c371adcdcc84b66ec1d5ab99dbb992f739dcab8605f5780bf10cf3fe9e7d185aa036c50abd170c0a56082f28c7bb45320
 DIST qtquickcontrols2-5.15.3-gentoo-kde-1.tar.xz 5628 BLAKE2B 97ac16b23318acea01d3c3a74321bca7d44e9ca84c5c542cc64817e6c21dcf6efe074c6ba0b4b6ad0a74369f2f8a249904ffeb7c977e2d951bbfff42e887470a SHA512 4c29c40a5f5cbb76de7073685eb8289fa046a9c25762146f5e42f262ff3debedd9b891bae45ecf7723921643dbd8418eada836f1409b75dd44b88b5548759016
 DIST qtquickcontrols2-everywhere-opensource-src-5.15.3.tar.xz 8286960 BLAKE2B 51cc31ead2b8943e59045065da68ab7a9e0785ac0e20947db95286ff41e411821e810cf34bcf1ad418cf847255e9409c3652b48e6a415d3ebcacdb84b8811a40 SHA512 c7127ed4b74c4d4d91ab7d167fffde0f20acbf75065be5e85adda19cd033afe4862430689e58a43719cab523864d615aa8befa004ae13e5337596dac1be0fddb
-EBUILD qtquickcontrols2-5.15.2-r13.ebuild 695 BLAKE2B 6b2b3678905c46e735ea17b5180e3782bcc583625849865f792227ff26815598584fb2cb0674a2d8b07c1fec932e35b219d839e10f238241b0d62cfe2fd83d45 SHA512 982a58ec94d878ed3b64159545d6d0196e6bc21150dda4060567a717caacad54b86401d3fef4f4ca586cdc401b2e2a64feae4ef00f582c8d64c6574c1065dc49
 EBUILD qtquickcontrols2-5.15.3.ebuild 661 BLAKE2B 92330a5576ed55bdb0952d8e74a4c4fe6c5300ac631b922af081cc018d61319ff271ced6c78e615b7766e369f249520bf094594755647c007b0f8e53adcb0807 SHA512 efce11739239ae381f2154edd0b5f37bcf4fd4dc70c2ebe7ac73247c1850e3a7518f9f65a4be2937c64b759938c838fe02fa8d007c42fcb4a263b20259a4624a
 MISC metadata.xml 552 BLAKE2B 8294b8e326a177905eb8b0510295d6b3cc97818c836b6b5d2940b78a5ecccc743c8818436fee3f3a61b2f984560c6fe6346d44e1e6b4fa27a7cf5a9a84f20dd4 SHA512 25f93b07946f9319e9762b9ba6c9adb5ca6348a71ebd5710c0f1690a75ca7f93af8967f323a9e11e7af04fd970a92fedf3ec30d962f85516c7b44f1ea749dbbf
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r13.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r13.ebuild
deleted file mode 100644
index fd70626eabcd..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.2-r13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=d8d6b14b9907adbc6ce307d52be34aaa761a58fa
-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/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
index 48dea30e2a8d..4e9e3566fd4f 100644
--- a/dev-qt/qtquicktimeline/Manifest
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -1,5 +1,3 @@
 DIST qtquicktimeline-everywhere-opensource-src-5.15.3.tar.xz 102668 BLAKE2B 73549b1ca701b67341f552ceec6aff714b132d7b37ece3ac071ee9fed72a0bde8516feff4d48b8eaaf78ad8d45e420f56b5902c2aae4a050d0a571778e004c3e SHA512 4ce49a112a6352b75bbce21bb262d26bb1e073678879ec82547da683a2dc7f2e9940687954bbfcc4c3012d9ebec9d768fa67d2beba941d187d444fc0049782bf
-DIST qtquicktimeline-everywhere-src-5.15.2.tar.xz 102624 BLAKE2B 65cd3ba114e8da442a32ebe43d36b653b3d9a35b65d4fd0eaf17985545ce918cf45da9484094ee889fe56d935c9b988a1deef1c7c416bcfd3cf153fd458eadbd SHA512 2ea623bf2d74ce4dea8e8639a9a8e4bbc9cfaf7b9ec84eec3da3b41b580962cfa6c443c8c47d7dfe312885f4250ccd6a7c91ca1cbbb0fe8385d0f41ad44c3b92
-EBUILD qtquicktimeline-5.15.2-r1.ebuild 367 BLAKE2B 8234ac716bc7891542739f6d766a34e12a3207548a9d4628b70888e440d8afe27248bb76e5822b45606e78acce33b0d7b9a8f82fc40d65917adee2ce43da62b1 SHA512 3abf2ad66d61f40e8967f600534e898eec6fed12280806b42f6a6c8928b4e40671e7c127c502858fdd8f31824d3f437714387dc00741f80f9b82f3050bc95251
 EBUILD qtquicktimeline-5.15.3.ebuild 367 BLAKE2B 9277628f8ddc066de3a200293cc02dcaa1c58127af081ed739a55cde5d0e9284ce76132d9392bb14aef54cf6167c6645d5c0af9136bf30a17bd9061561ba165f SHA512 0c4c90b683682a5e0a775f13f598b479344c51f5ee034275abd11dc23b7b4571e7b2f2a387a65211b22b73aec7c3e1b089e9b23f422e16765539a5b3516c0fe4
 MISC metadata.xml 383 BLAKE2B 8f734db19973b4ebfe57cf9417f7fbf6db00ca254cf2410e336c2f252aff7e85500d5fdb944e511a48bf08ebb3ee74e729073f567b9d7558efb19024f7c1e10e SHA512 c0c9a947c7ab5edce2487560d6d9c215966ba5804e370557f2d2a35d67bc6c1ac8a04afdaac8c733cc66be0977835826ecd817248b83c01f4230f8824fbc41a1
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
deleted file mode 100644
index 3ba1e4d5dceb..000000000000
--- a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 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 84efb5b2dd06..00471122d166 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,3 @@
 DIST qtscript-everywhere-opensource-src-5.15.3.tar.xz 2663512 BLAKE2B 742c35cb037378d3379e0311daea5d051f448832e470a7d1a7ede9e3e685472804c84d2432e7974030d7469023f5f8e7868bb2e24a854d4f41929c2fabddc9b3 SHA512 ce35799a5625226fd62b394ecdc9d6826ef386a4b2d1a085a3def927ff3cf4808542a7e06be313baf12838fa0d2c1dbe6496a4e34818e3d035734305e60c24d9
-DIST qtscript-everywhere-src-5.15.2.tar.xz 2663016 BLAKE2B f3cf09396fbcd9c386de9628042d2b70263343fec3e1fa49e53e705f56802a244373a37e5daafe6d90252ad67a8b1d3e0446aa4520ff8ff4a8bd010951a5d86e SHA512 71c70b34f7d4a0742df64d20d7e9a685cc640b9cc6a3d22847c04f45a437b3f5537f40225a522ed82787c2744d9a4949dea5b43c2ee81961d5ed175cf10deb32
-EBUILD qtscript-5.15.2-r1.ebuild 685 BLAKE2B 694f2b109b5969defcbb57b3269ab134ba2c96a3101e8fc51d11fb8d500719185ccb4648d5991b5d6dee077fb743337d0e27530deb9ed54a608b79e11f1ef560 SHA512 13f57b04fa8f39f26e50190165329ad30d3775656f1ea0d7abf9e27b3baf9ac11d2fdcfb00edb542fa3e12da197dd3de1e8085cceb2ac044d8cf9f30b1b36321
-EBUILD qtscript-5.15.3.ebuild 687 BLAKE2B adf1d38e130b1c43f6a519055d9c1cab7dc4ce0d5368064a993ad43244bae70f09f184b4bd8bd17d382bb66718d5c62f2515ebfb9d7d409a1d1a5776452af5d2 SHA512 9baa6db94de3e2d72eef0206a073f5dd4952d3c48da0ab1e63416b388ccb517cd1f6ad994478d376e2e1c41b21057dadcc0e761b86de87bece44fbb56a090c86
+EBUILD qtscript-5.15.3.ebuild 685 BLAKE2B 3fc07079a14a52774b26208963f00d6737646e1fcd05b7d3cba2a40abc2374e0a453f53cfdfe25c5c20b093262041466becc4d6d48f0ca5971b9687a4045807a SHA512 fdfb34d567c21db9113cb9638379ac0b9f6c6ea5f8fb2ddca0e3dfb084be9790729c655a23fe94c0f00b582f4cc3cf95d11a2d5358af65891a903a9d3d3997c2
 MISC metadata.xml 583 BLAKE2B 5389c382561f060259c9eb626a98fa6d1861a33cffb3ca62899cfb6f1b020d6841314edd05c4fd0e5f05593f6015af8826f1d087078754a3dd31ae72be7da4aa SHA512 f8d07eb515db1b455670371655c572aac73653a2d1af68d8a226ecfeaf77b62737114a66bc41375cf7f32d575df792a685298487a90c650b6c6dfb4a7c113181
diff --git a/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild b/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
deleted file mode 100644
index b855afed554e..000000000000
--- a/dev-qt/qtscript/qtscript-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 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.3.ebuild b/dev-qt/qtscript/qtscript-5.15.3.ebuild
index 5a14d97da1b5..579e5614509f 100644
--- a/dev-qt/qtscript/qtscript-5.15.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.3.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 14c6d2ab7807..75c9d92afb41 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,3 @@
 DIST qtscxml-everywhere-opensource-src-5.15.3.tar.xz 434432 BLAKE2B 4fca0228dfae034b19e8021f717f71ac84f71b54e8245ac06168abd509925c16ed4403f0af2c7d7d20bea2043c4fb22cecc33f9e54972788370b8227050d8c45 SHA512 59b4f2f5bf86a6528cbcffa64a1f3d300fde8509f94c95956558f8643d8f4d093609f4f6d4c095a58e5ea639619f7fd0da6046b2cb72c3cf505859de83aa05d1
-DIST qtscxml-everywhere-src-5.15.2.tar.xz 434204 BLAKE2B 8deaa46eb784690937160470b20dc01ae1b2ee80be89f1f19a22e1e2f2252d3d33427e96bb97b4ec8033b54a78c2a73e3b00fe3bbbe061e9b9bfb299801847fe SHA512 2a4719af94baefe7f0ca5a23239d07a05285a1698b052d17bb87bc221bbbc8bc25a70ff06d70d41ed7ac6a7e6646be9c516d8187c9098da1158c08e27a4b0bb8
-EBUILD qtscxml-5.15.2-r1.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
 EBUILD qtscxml-5.15.3.ebuild 398 BLAKE2B d97708b7ba07f13cb55fa5f0f3f291b432b34db2125cdd06f56ab43b1d2d312ab4b07f3ad2a7eb062e61a8f7b42dc6268ae969ac2f23fd3b65fd7a4bec0f2dc6 SHA512 07cf036cbf059263719cbbca7447642e9329f22684d874280d7e68ba3fc9a3d18c24e9d7c776812ff6276433199c71250d800e0173880cbd022082a77dbd47d6
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild b/dev-qt/qtscxml/qtscxml-5.15.2-r1.ebuild
deleted file mode 100644
index a778e477a992..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.15.2-r1.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/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 7b58530bd9c6..e052f3b06074 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,3 @@
 DIST qtsensors-everywhere-opensource-src-5.15.3.tar.xz 2057388 BLAKE2B d6eb62a51e19ea18d2ea1183e5d74fa8e4b7e7b3a1d3d0a5654d51c287860c3a2537ac74ed1526c56024697840da954a24e0656b0a02f94b7d591ae55678f309 SHA512 c9e69e78cbb3624cb1130c172a46d4916dbe5fc93f0f844262483468c2f53503844158e72b25692625f588452350bc2f125f583ef7244c62b2ea788ac72e32e2
-DIST qtsensors-everywhere-src-5.15.2.tar.xz 2056944 BLAKE2B 49f4e91027b122a16d65d953275b8720ecb9c12e9bff3a190df59dba703f6f3f8e8ec8c8fec1084154ec7a03a9a2c5d2fe196ec09ddf8f2282c16edd3873a965 SHA512 d0a34e0718cc727b1256601bc5f9a2975532d728fdf0cb7678824c7d36aa5049d9c2886053821ec93a238120441c980027306ac633677617867c7aee40bb560b
-EBUILD qtsensors-5.15.2-r1.ebuild 559 BLAKE2B 8c14a3a0d27a2555add9398b246050dd386ac2d0c9fc597e7c2b915846f8045b416abd6a28bf632c3d17d94939c896ab612092e3d925c076dc1f4af52ec55e25 SHA512 ec69dad6a14f8440b0e54d3921ed30e7acc05e5fb775ef9db1f18c38ab544fefc827391650ea3f9d894044d7553c3b1a79e1cceab6a8898f374c94f76a161a04
-EBUILD qtsensors-5.15.3.ebuild 560 BLAKE2B 2f90d8df6a5a01e49ece0c5646e09926a32cfb3d12b7a2cce85404c41e511e79380cbba0aac1ef9a313a19d37a09f21e077403da9dad7127b2a9a6cedb23ddf2 SHA512 b691c9dd9863433c3a518a81b952a057f92a5a4fb4dd7c5815b8e6c7141cb5ed3634aae7322950368cc74ad4100e06b2aa455dd1321b0dd5d8ae683891a94120
+EBUILD qtsensors-5.15.3.ebuild 559 BLAKE2B 78224588951cae1bddb1998a88a639d52ed8496ce5ab4dcbca7844e101338bd07056b31513154a0680a29c7c8b77a8e7236f45d0b39f18f5cd1d3c6d74e30d89 SHA512 58203d919cbf1946d01208df3ce4ac7ec37dcc516ce5c982d832d554224d50c65c90e9abc9736e0d9baf561504369eeb95250c4e24619b38fb2d2d5b0f69b532
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild b/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
deleted file mode 100644
index c28fdfe54405..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.3.ebuild b/dev-qt/qtsensors/qtsensors-5.15.3.ebuild
index 85c3b42cf0c7..0823e6a19fc1 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.3.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index 4922add500ab..b60b3a848a3d 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,3 @@
 DIST qtserialbus-everywhere-opensource-src-5.15.3.tar.xz 356520 BLAKE2B 72ce583891922672d9ee3a62f849846cf2d641847a65262f70020751b64c99b49469eaa7582d851adf020bd6203b1b3fe7c6a797af16be251c4ce32135d9419e SHA512 af04a26d31d627592e5d91b163fd7e968a0ff42812b6f7a9f0e73ae5da32cea9e3d49c4abb93d7badd61f0d63a976572a5b42ceb140c761807b31496a9f1af87
-DIST qtserialbus-everywhere-src-5.15.2.tar.xz 356360 BLAKE2B 491f3a7b9df8f58496cff1c4fea87615335486ec834f859029340c7e34551e1127ce4e2689f16e06e195e40691300475ccace19c1fd43fefe0a56c10961184c2 SHA512 c4793f5425ca0191435d75a8fd95a623cc847d41b8722421c0bf0fdfddda1a158fd2a00f5d997f00de4fcb271a158f3273d636ef2553ccd6b90b4d072b1eb55b
-EBUILD qtserialbus-5.15.2-r1.ebuild 430 BLAKE2B 4b935e7c6fcc6bd8828249e6967320fa3fac4b87e6cf7543849c8cf57a396707fc4abd2e76fe91e59f6cccbbeb972ec1f2598940a5e2ba33236cc426220ecdd3 SHA512 e36aa6019ae92b0ae204e2749b488867c40664cad03bdaf43ea73c9344e0ae2fae9151491fe1b1318c64acab0f218900f596682baa26aab0f1d9a2b710da8b7d
 EBUILD qtserialbus-5.15.3.ebuild 430 BLAKE2B 7970edf0e0fdfcf05f8d4108cb9cd6c98d32bc38eaa063f1b44e18bcaf939ee7dde16f61262570a50ca820273f890413dac1713396f78c8e62dc731e2c472068 SHA512 60a20b83efe552b946f7f086d61354804bdaf232b12cfabe22d3b4ec02958ed1c3e42f3bd3cb81d817e3a8d3b9db29818a5f8429c85e795d66e14149e139a526
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild b/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
deleted file mode 100644
index 0d8fd68fa6e0..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 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 47e7a323f690..8f1b4c2f867c 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,3 @@
 DIST qtserialport-everywhere-opensource-src-5.15.3.tar.xz 321572 BLAKE2B 1ddfdb27afda4486b6ffc137076055a20eebae5ab099c22512c94a1a735730b13632961ea27defbda48b333f0867f16b93dfdfea7382f32022c7456e4bb836d0 SHA512 1fb4dbb5d41c3280b07119d625030489566be29a1b8a7c555f9d484a7dd8c812a7e831147a8017d9026a77fdd57d48985a96f4e6c7887d90342005cf496b7b3a
-DIST qtserialport-everywhere-src-5.15.2.tar.xz 321496 BLAKE2B 1a2d1a925a1f8224de6babad131efa9bb2e417574be939be35edf3a3b9f34a7fb12cc282f94ee2d8e52178cec7679caf1402f5a45a14bb15a546023fed494907 SHA512 353cc5f708367d646bd312f7d675b417bad4df44356f1dfc8b6ce846a86fd6d5955ec4d26f943e50f4a7b94cc6389fe658959e90bbb5ab3cdaefed0efe6ae72b
-EBUILD qtserialport-5.15.2-r1.ebuild 558 BLAKE2B 5c281a603275cc97952fd5687479c6e8c7f56a5a08a93bc7d66ba4ef3f9a77d6b5a32bc3372ad3ed9b7988505e8f1e27bf70f3aee5311690f5dcbdfcf3e0e240 SHA512 fd20efebb0baed3876d0d231301ad1f17c6599f7860ec9bb3a33f8bd840f926e503b3d9703af9b9efbca55dad06ec428a7833db0e0cf9580f2269724de554c3b
-EBUILD qtserialport-5.15.3.ebuild 560 BLAKE2B c4b6bc3f096ab88659ba9a7026c113061a7e49ad06314873cfab1a658f6cedf65aae74c5ae31e6d20ddd570f807fb1895f178e57a282ffb00cbef1b3bc4ef378 SHA512 431fcc3b6659437a527e2653ac6911558578ded40248e5857520d60f68422bde9bc285d19dc4c00e98f1bab48c1663d19c008052b0571e2bc4a5d1eda592c78d
+EBUILD qtserialport-5.15.3.ebuild 558 BLAKE2B d92e70df53f6ead0ed247b8461bbf57ca2c83a0e9ef18feaf8052ce9ae23499432fc0c0491b316a53cfa2af41d6e784e9207b582ece8b415d3c4ac5aa99904a1 SHA512 d38f4ded5ed4a9d73b59ee7f8ef134d29d943a744b570ea794807b96b0debf3b2bceb10c80181f4ed6790d6c78323c6928129daf8fc22f5990eb54b2a937354c
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild b/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
deleted file mode 100644
index 26e5eb53bd00..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 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.3.ebuild b/dev-qt/qtserialport/qtserialport-5.15.3.ebuild
index a78b8ba9fc77..b0dd7a0e8062 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.3.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 56ed64a1363f..746ba2a81a32 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,6 +1,4 @@
-DIST qtspeech-5.15.2-16c62552.tar.gz 93297 BLAKE2B 3d880469fc83e0923bcc7bb7709273adbcd1d0a5cbc59c32560fe0256d8c4f7ca00593ec400c038b79f1f1ce42236f465d3df9ac643c394791a7ac4cd0d8a98f SHA512 201b516cde7b12cb7313e222cc893a1a7be0751ed54ab84e86f23fee36b11653c1cc79aeeb6a5fa4172deb388ae93fc9da39d5ccb65028ef14d36477f0e4e9ab
 DIST qtspeech-5.15.3-gentoo-kde-1.tar.xz 1036 BLAKE2B 8b648b77ed363060aa59bfcb8dcae81af1f9712e347b3f29969bb5a2a0b39087a8f469240c70f3bb9d2e371c70cac5a659f96fd3c34c02814bf619aa55fe8161 SHA512 0c0714b7a603eb7baa45af7fcbcb922750d38d4e5f8bba4426a7b5e5986fdaca4b3538ec4f5fd5f78df1e12892ad77713231cc1553cb875c1903f8ce0f61adc9
 DIST qtspeech-everywhere-opensource-src-5.15.3.tar.xz 101852 BLAKE2B f6184e0bb28f480c7843aea772fa3bb59219dbff79213671051cf6b7322a14e8ad8f6bffdc190b5d0059695e6d780f6a97abc661a97d64bee55b5a919208eb44 SHA512 43790477887f533df9a1cfeb60194e171cbdbb79bce0f7d90228750219a67baa4b94a7f9d3833958bf7f9553f3f6302f980f269ce52c3756c116a61eae632a2a
-EBUILD qtspeech-5.15.2-r2.ebuild 770 BLAKE2B a8c2546b7a6ba35931c40659a353a6c2fe4def7d0c2d593f2c289fc9172a7a07b80824e3b53c161e533cf41390f0698a30074c9029396c07d8519099e29c8905 SHA512 3b5955230690748bc04aa3f5a1a5a872695e31d33a4f06c6530481e36b0e5199baba31e44eaa042ae6d0c2efb6bfa518acd9b3df906a4ab4ed28787f24207dfd
 EBUILD qtspeech-5.15.3.ebuild 736 BLAKE2B cbd822e11649702a466183361a95063a61e7e3074e56bba84360de3a906ae2a3b4ce9991d0b627074adfcfc8423d8ad1bee7da0b4e60d91061c1d3c5d22967b2 SHA512 4093d3ff0e2d50f3aa079a172ef88f05da150d3433be1cb13ce43b85c16652986d6879fc21c3a02c6d266e7f1679dfaf409ae66caf71f154c6520a9f61216194
 MISC metadata.xml 614 BLAKE2B 93e681cc8d9a330c55a86b22fd190c98c9d834cdf85755c4e61365e288f51fa31854788df2ed2a73aab1736b47f0e7e79f8cb6ec504d74614a0e068d8b783365 SHA512 780dc74110dc359d3764fa7f3a1e4c60f1e05f51cfeb377de8ab043d95c8154535657e46e5f026b66dcc612a1f36e007ae2d531622766518a108bd58407dc2f9
diff --git a/dev-qt/qtspeech/qtspeech-5.15.2-r2.ebuild b/dev-qt/qtspeech/qtspeech-5.15.2-r2.ebuild
deleted file mode 100644
index 7e18ff7c96f3..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.15.2-r2.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
-
-KDE_ORG_COMMIT=16c625528f5e34e698983fc66a7c9cfb96da8052
-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/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 8bdcdf7b8e95..0e4e28dd01a8 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtsql-5.15.2-r11.ebuild 1300 BLAKE2B 797226aefd798a686b1ab3f2f774a616fd1d7294d20a5c98b4f5e4ecc90d0bf2f9ad42d0c11012b952edb9270bf292165c98c0b095e5c08f0a6abd14005bd008 SHA512 f7f0f507e50e44fdca6be138a5f14b186ebed1e4f2f9ecee656246a21df1c2e56c0bde0fdf84fddcd5df6af9451eeb2b5cb4500539f6f823a223adb7eeb250c4
-EBUILD qtsql-5.15.3.ebuild 1267 BLAKE2B b6306a3e341370c946b97e0ca65b788123fb0c9b2c5695372c0b386e74288d066bd4e0c30623758b93015d19c18cd8948570efd671bed364c6b577c52a735b88 SHA512 662a06e04bfbad79643f1bba42fc9dec7609a7518c7941353697f7e4574f2b9b06c45f6990045538de395714e913c48cc4767a16dd4e3a8b3f1e227ee76fe6af
+EBUILD qtsql-5.15.3.ebuild 1265 BLAKE2B 13e902c32e37d5cfddfc7d250e7e534aadfd9eb78a4df108448ea71548d85e520e8400d98190bf97c370b10bd5f77e273d3a64ea43c909faf6db52ee0a710c80 SHA512 235338720210c84624728b09dc42a5fd8394b3d27d6c4242483fdfdaccf56b2ab6873f9843e55d1c254c5549952a54d5c552091ea951c926602d4ba6061e5f6a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild b/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
deleted file mode 100644
index fa5f0ed70dfd..000000000000
--- a/dev-qt/qtsql/qtsql-5.15.2-r11.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-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.3.ebuild b/dev-qt/qtsql/qtsql-5.15.3.ebuild
index bb5945081f0a..475735092f6c 100644
--- a/dev-qt/qtsql/qtsql-5.15.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa 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 728cafa15bb8..b3905bbe31cb 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,8 +1,6 @@
 AUX qtsvg-5.15.3-QTBUG-90744-minus-binarypatch.patch 4929 BLAKE2B 0df696c3422105308a1f8f36150c2fbdf0ca900839380808f27455cd36f443b9f45aed818ee93130c9d687d26079588a20cf3cc90dd8da9aeadc5e8902d60cca SHA512 5a2ee79c21dd32ccce18a784d57d7d6b17dff2c109a548a1482152fe96f524e87cd5d09a504e15d6b1435059c431606335a92f03f70c9f28a63e5786cb78412c
-DIST qtsvg-5.15.2-728012f7.tar.gz 2779740 BLAKE2B 6db82739d576dbb2d5958e48ee917dce9ce10fdf7af8b561f0c71ef3a90b97935e89f443ed1a95c827d85d87ffbb53595c27057f75bdac11939ba2bc9ef47f36 SHA512 ccf16606ff0abc9dce1279d58bd85489d0b1205da953842e12e8a9dad895c53a4420e4bd1aeafca1291f6721e2cc5c1a1178ad1d329832d21cc165646e8448d5
 DIST qtsvg-5.15.3-QTBUG-90744.tar.xz 632 BLAKE2B e7f2f52dc546f9520ac2311b417b86d697ab20f8d02318fce76d46b35efcaf3dccdab5377d65c01af3a193df478083733c466e3a778325e73184f84830080686 SHA512 1681a2e0395d97b30b49b981e342b7e647108ba19b1472f34239136e1b946da67afaac3454533139a55a0f5f0a5fd167596a2ca7b26e4c018fa41a91dd94cd7b
 DIST qtsvg-5.15.3-gentoo-kde-1.tar.xz 7384 BLAKE2B 25d0b5216ab6c0fc8758a55138000b641d2ca57a64095c1117c1d5da59cca3dda890fe2b0b8589d5be0ac19e73f3a329af5710dfa163a25609f068d673f830b5 SHA512 4b512bb8ea1ee6e38b28ad52a34a1f2b6a6a7ac72c341b8faacb599f6cd770924ae7a473052c59783653a734e8061d0167633954a6d3d9ae2ed33e0a65adeb44
 DIST qtsvg-everywhere-opensource-src-5.15.3.tar.xz 1886104 BLAKE2B feced6caaa2e2be089ffed77f32d3b0de899b8a97632234ca8aa9d1f34fc0ee94ecd44227bb7c40ec49f0a76b305dc29ad23498bff3c62f45054854ed632b1d1 SHA512 288ce98bb6dd746564c7ffbd0d8221d0816c62b7e33424cd21d945b40308292ec9a0b1e2b9cca6ce91d606c06813f05068cad590d827810383175bebfa8ab527
-EBUILD qtsvg-5.15.2-r13.ebuild 535 BLAKE2B 4f36841bf587020481ca66e7489f9c99d0cdec5c00ad60b2eda3029b72de956469046c8fe4d0195bff9a1399f6e690fd1ef6c6e8d5b6af3854ef5c1b8e8da01d SHA512 7b07d9c8a06b3ede0f15b403f27532129f9bb6a8d8a49c6a8720222b63dab05bc0094ae4f8c364afb67fd1a6a381e954e0bbf56e452173247cbb52362f1581b2
-EBUILD qtsvg-5.15.3.ebuild 842 BLAKE2B 26dbd1f16f083217dd8667f0304209b3d3f3ed71a78b4a653e79a54ef13fa0ae35e834c1ed8d35414252e7716501828ce810fcb05a1cab8774867e722a1e637d SHA512 3e3188c217c41325a0f6d74f60ec9fab45a32953349cc932eedc32499c7e1ca3fe7ba8bafd053300dd765f5bacfabedca60d3809bce396024a067bbaa01741d0
+EBUILD qtsvg-5.15.3.ebuild 840 BLAKE2B 5be8735e823010cd3857c82351276e98f5f0b700a7b97c0d914f9442e28143596795bc11afb91cdd2d19cb5e6a801cb7c415887d7340957db1144e7661953fe4 SHA512 2ca9e9d1afdb6ba9e96fbfefef41d1b953dc24ae9253f4e825303f4aa1c8e9a80d4c008787da81938e02f7bc0092e4f4e3da50e6306fb332c84bcb42737a0772
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild b/dev-qt/qtsvg/qtsvg-5.15.2-r13.ebuild
deleted file mode 100644
index 4964620056e5..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.15.2-r13.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
-
-KDE_ORG_COMMIT=728012f7762ecd5762d493f8796907c6456f31e7
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	=dev-qt/qtcore-${QT5_PV}*
-	=dev-qt/qtgui-${QT5_PV}*
-	=dev-qt/qtwidgets-${QT5_PV}*
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( =dev-qt/qtxml-${QT5_PV}* )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.15.3.ebuild b/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
index a9875ccb514a..134214df28a4 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.3.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-QTBUG-90744.tar.xz"
 fi
 
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 91a1db2d1e09..7f1741eaa116 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qttest-5.15.2-r10.ebuild 617 BLAKE2B a79896ed74c27f62a712e16c2f8b30af3a3f4aa7c3cfadb019961ae60f0e38d902f822a1d3efb25b891e42e95d46252b199903605f976773b5ad30744b650df2 SHA512 3c377225f31f8873583f49386441723282c8968d1fc1742098bdc96b6ef061940c84ff4f318f233bb4dc9365136de14f01fa54f3876a080b00f3405cf8729dff
-EBUILD qttest-5.15.3.ebuild 585 BLAKE2B 0cf7772a7400bf1334c26ceedd8673171d522bfde4674581420d8376c0f7ecf77d16c17304adf034dc0ae97dafe7d67191c9b987c278e6a5eabc31530d76eb24 SHA512 5c701179728cf175877cea2bb3d77e5610bb1017bcf42a4e3fcd6f6a25b838611c8ee917ce52f7d59df25951d2b9505f85d71b5015f4a43c690c332f4a1d422d
+EBUILD qttest-5.15.3.ebuild 583 BLAKE2B ba7aaf137e4d0644f14d3da5bda9c75bb11077b0ccbd2343ac9b4e7a3953ef0eeb1b1b3d5ad42ce8d9988f3111c6d03eab02723beb6c4e600be9bc57cc6d0d54 SHA512 9aa25ab7783d36278f1009e6039dfa695621e14bfb5694961789e1940adb9d7dabb92f5eef1b46dd2219442b0e0f285bb8f3382745ff016b5c49b5554a86e715
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttest/qttest-5.15.2-r10.ebuild b/dev-qt/qttest/qttest-5.15.2-r10.ebuild
deleted file mode 100644
index 8489fbe36c74..000000000000
--- a/dev-qt/qttest/qttest-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-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 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.3.ebuild b/dev-qt/qttest/qttest-5.15.3.ebuild
index d9a00d30d919..9370c7c39e60 100644
--- a/dev-qt/qttest/qttest-5.15.3.ebuild
+++ b/dev-qt/qttest/qttest-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 0b46f601eab6..fa30acde6bab 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,6 +1,4 @@
-DIST qttranslations-5.15.2-68f420eb.tar.gz 2994506 BLAKE2B a0cdc69f6fc9b455b98658ee386d15346c1c23eeedeb4b7ca9d7cd7b60e7ee06a537a68530d017797683d60485dc38b02144f35f3e3e94c280a00b65a690bf97 SHA512 012e83971a8064d87d0d7ea50e6a9579916974fdaef195f1eea1639673085512bd421ced7abc2550c5b07dad264c861a75cd8ae6d48ac1c5e78f5359ceaa61b4
 DIST qttranslations-5.15.3-gentoo-kde-1.tar.xz 1108 BLAKE2B f3d461f309225001c5c6af038fccb78a2a14902d02018f6f5c0af53a0033328fe9e4809b054982041d1d48f812bf1fbc9aeafe2de1abbdd9406739600c28ebcd SHA512 4e40f15d2477567043feec3d425dd835ac977fb03444043a3806c07e4286dfdab1ffe4d7fd76b3e26ba398bd28e7aad49befdc1b7ce39320621bcc864de19f98
 DIST qttranslations-everywhere-opensource-src-5.15.3.tar.xz 1617284 BLAKE2B 983f3ca42c3d0c896925e9ccdd9036eb9c91152515f5b99227508d96b41ff3a6b10dff33bb5142c2ec141f7757ab2ef10af11ecdc4c31cb43fa2375dd153a926 SHA512 d2939a93a328aa1a8011a0e61970d9ce6a99b918aa35dac9fe10d8b65662ea5086207708157751573431aa24973a1a07e05c25fb90a254861a40d85a845bb1dc
-EBUILD qttranslations-5.15.2-r10.ebuild 441 BLAKE2B aa97439b4b527c2d7f8eeb3241ecc1649ce73012cbc6878de3f4af14b0e9c8bed736a7a493610f3e36d2706bb6ef05b62b2c91637eada4c39cb4d89a7aff018e SHA512 86658b6e379b3c1e1fc588629cceda4e77e196cf9b36a12a092e1f3f9872d8d6b607628113405a9aa809d800485f88077291ca2f02171ec3dbb7f71833ccc1e3
-EBUILD qttranslations-5.15.3.ebuild 409 BLAKE2B 1a71889f5b3fffb885763265dcf8a445ec7ce1d892cc6cc703c492285116341436763ccf0df532cfd207d9e8d4e56b396a3222d53d977881b8d0ba73bcbc3bdb SHA512 80af7f8971ac1d3e5baf38920376ec306b371883c16695d80d1579f9bcbac652078ca6bc1b0d3e97e2f3cb3a4450b60ac3408817492c2acb8e5f1ee09394b83a
+EBUILD qttranslations-5.15.3.ebuild 407 BLAKE2B 0b2db1f33ec94ea0cfe85a5708e3dc3afc3d30263fe12a1728c53d32c41e6ae9fd2568e0d63de9e9ca78adc634cfba7f6df7e715d4b10a7f2245052849530a58 SHA512 b161d86275f28e0167e93b59550b586f353af80b58a9ec782733929aaed05810d435c1be8b8206e6e9fb2500271a81164bed9f6f4891e16362a1c6429b7b0b0b
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild b/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
deleted file mode 100644
index 95a06c5982b4..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f
-inherit qt5-build
-
-DESCRIPTION="Translation files 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}*"
-BDEPEND="=dev-qt/linguist-tools-${QT5_PV}*"
diff --git a/dev-qt/qttranslations/qttranslations-5.15.3.ebuild b/dev-qt/qttranslations/qttranslations-5.15.3.ebuild
index 1203941e14d7..b54f7ed85514 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index fc38919fa27b..c02daa490b37 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,6 +1,4 @@
-DIST qtvirtualkeyboard-5.15.2-98d1fd86.tar.gz 13693307 BLAKE2B f91f01fc70ecb2f50052caa5e174f179076781bbcbc38af05816e12a10f51facab16b6f8350d84ae65f25610cf75afcbf601210db210d0eb864b54f6b6aa9635 SHA512 3ea4b945a4e6fdcc288c0cfbc2bd57637f1c32e81271eaaa6d4e287f4ffded10dd41367e937d83d4effcc7a7e8ec8d4842d3891c48cccfbd3235fcc6628883a7
 DIST qtvirtualkeyboard-5.15.3-gentoo-kde-1.tar.xz 1068 BLAKE2B 963ce43df400ec01f8d483f75d46f50e61b22d33df59f82fc50e4f3bc1d62a39a8556744d5b3f5bc9425aa69f5d30b74abbe6390287c2319824b9b95733c2411 SHA512 373ff84f82e5e8b202dd42c03b446efecab71af110363387ea885cf76eb618bdca02b80935b15cc14e49d613191af11a60aeef723383a5e2b2b9340c430e56b4
 DIST qtvirtualkeyboard-everywhere-opensource-src-5.15.3.tar.xz 10959776 BLAKE2B 1147b74d148398736dbdadd3e6513d23816be889a0995fcd375d36b41ad4624ac295afc89a9dd089b4b7587a8e1d09c654d081adfd26d5847d6e6b10a892d794 SHA512 f6033438d9a847d3592bcdbc9c525a2bac730621b2279b36157f8eb11c6f49fa27b5155835c3cc1fa412a0509ca387c5a7063d20b6ae0ff7aedaba786d3c75f2
-EBUILD qtvirtualkeyboard-5.15.2-r12.ebuild 1277 BLAKE2B c1cc48e49b8d61d4c4664c38a239a5f027f4229d90e230afb886bfbd94095c7fd63161c42207dd26820fa9f8af9228828429c5ef8b5e030b3bc8ab6a6dc84962 SHA512 f17daacea478180f8a7d72896602f2183cd2e46e0d82de2b0937ef555a2009e7bf1c5eb7e9950ec456e64f57d448b7d352435c8134eae0d178a856e9734929c6
 EBUILD qtvirtualkeyboard-5.15.3.ebuild 1243 BLAKE2B 68a7afa2bf230226abb43df6f46d18979169e5182b242ec23491dc7342215511000b581dd27db2759cbf814d8ca5acc5a3b7199b13729002c9c6a11fd55ce500 SHA512 ab6774a30655d7e19c781cff5b29c05a4c0a6e73f6f4a9e21a60129f3184dd2ccf553cb0237f0f267ea0ff31d76ec1ee3971ab1c9ac65e1d40fb887831eb09b6
 MISC metadata.xml 580 BLAKE2B 18223136bcc07b46ab272ff282bcdce54dad6e6d97fe39b5431850a8960992a16eed32a580980748368ff120ea50ada55be823ba1e16950856462979835562fb SHA512 e865c0a030aeffbf270300806f99d1b2ff4ca148b3e1a3a901df25d1193e84d63a99b643da033a469dfbdbc99e559f71addc7671487c92d94e9019e742977020
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r12.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r12.ebuild
deleted file mode 100644
index 95fba6ff3019..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.2-r12.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
-
-KDE_ORG_COMMIT=98d1fd864cbb6c7c012c4139118808af110fb8f0
-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/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index f706daa4dce5..d2d67082bb2e 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,13 +1,6 @@
 AUX qtwayland-5.15.2-QTBUG-90037-QTBUG-91264.patch 4691 BLAKE2B d817e7715759dfd6a6efc13b3b8e7742406b3af7cdf8602e134121b8d6e97e857dc82bb71e32c0ad04a04fc8f20443475bd5a251ab6eb0c83412a75201865561 SHA512 82ac704e0a57a0e6272676c329e29116a7ab4186c94a1e81fe4f503bf332b20b699930d86ff22e9a83e72be856a5711230f264a6d10991fd070601ab4e4fd67c
-AUX qtwayland-5.15.2-fix-qmake-deps.patch 4129 BLAKE2B 7e74b67de4a73a7fe0ff8027d897f8e01ecb1fc8d198060d39e3958feea5c6256ccd837ebedf71e4862807e7183069af009d1af36c27240decc79f078ae793aa SHA512 132791eb8837bb760bbfcb459b81306351c5d3d978d347d79d9eefe44f2878c88a0b2e287f30bcf04e3a4d98c47803763fcd618b1535254a8fcb1c1e6e123494
-AUX qtwayland-5.15.2-fixup-mutexes.patch 3164 BLAKE2B 59859577c9e28932e66283eb65c2923929afa284d8c7e31e5fbe0f27a01176873352fb5bcbfffc5d4da875310c3faa4ecfb1148fa9a19bd31c40d1b8af864efd SHA512 fa022a4d04f3fd8cdc7ec5d8763263ae724ca0a5e978bee54ac8a2a91a816b02a5c89bb3f92d80d5b4f4487f602bd02e8fe196cf97c79a05aa9ac6cf2aab89e5
-AUX qtwayland-5.15.2-guard-mResizeDirty.patch 1340 BLAKE2B 2ba77b36531a88f7dccf99fbdbd20adfa9085accd074a6b205a09743fac1e41b7410191101d7e2eef51458e821e4e37cf9bfcad849d31c948bef29b6f8f1ee88 SHA512 0a38e1aad784c66e723c6cd351ed6414c9cb53f89c106097f5594e24b7d22a8cdc96180fc138948dd0d40444ef16544f3ca3ce0b52acdda5cd7839954f244980
 AUX qtwayland-5.15.3-clang.patch 405 BLAKE2B 914a7448f590cfd6e83ca32352070644bbb6c07bd794d6f86ff6346d4697f6734d4c61469f20fa27517cf14f4742df946dba1f20ac242ea50d8e712733e3c099 SHA512 41da7708a596eabbbf58baa2d081c6a870fd49ac5b284c094e7e3230df201ae29627de1470bc3a80aff3dd30166b51bf9fce53e3d6fda0f18b97452fda3cd467
-DIST qtwayland-5.15.2-867540b9.tar.gz 830061 BLAKE2B b831288d6a3e671631b4df00eb1edb72e35128f3ed5a73983b3e15193f554fddcd0337deb832d44b795d2e37f0601fe35b8b0fcb5986bcc44154d172f3a54193 SHA512 b834802811d9f65559ef5e7468189b53c666e390aa09edeb490e5fee2dece13082b11da0f8b5924b89f7dc8e1eba375a485940f4dfbf0445f3d1e96033e33f24
-DIST qtwayland-5.15.2-d6a6b727.tar.gz 831439 BLAKE2B 430f7c8570f9941e80db68f63efa9669f40d045e8df8820ec8653152938078b91d8d68b76667c6c01cc83cfca3f3b0ea67b6fdee6230e04fd091dcaaed4400bc SHA512 a2314f31c979594c4bd46fe8f1ac44d3391e45e6fedef44eaac5fb8700d1b32ac992f3e9d17e2453f0311038979a2bf8fabb14ea887525e16fb210307844c71d
 DIST qtwayland-5.15.3-gentoo-kde-2.tar.xz 35460 BLAKE2B ea229ae3007405dcb431c90c3a8411d11d2d5715e917f5a57cc2881da4274938d6466f1562dc5f750b8d27ee60a459d6251ca1ab2563f6ee4b9f89e17a956b59 SHA512 63041bcf68869eb5bd1449bfeecd9847c6890378743eaf1f6cedd95b01f54448be804de6bb5649d70240d4fe98d39fd58db2ba5a5234269c17b5127dd1d76dd3
 DIST qtwayland-everywhere-opensource-src-5.15.3.tar.xz 565004 BLAKE2B bc146caf77d42436dcb599df8d2aea422ac8717151dee91b9be129b97902d5af274dec90bd5ffceef62512515e5cf57a61ab773cfc6c13742a6cc5d9b6f72726 SHA512 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89
-EBUILD qtwayland-5.15.2-r17.ebuild 954 BLAKE2B d76d0fada2321e8e74e00f678470963f1070fee8c93ca59b6e5255961ce726a49bd8c2a6baae87cc2a6b67a1d6ecfcaa2532966313b4b096afb807d7a5c27786 SHA512 068cef3071a0ec4ab569201cff69189b234fec2149e3be5b397dbe0219bcc2fa2360c3a7fca4763f5f48abf4f7c89b2b5142559bee44ae46490749dacc785fbb
-EBUILD qtwayland-5.15.2-r20.ebuild 1149 BLAKE2B 8a6422405942a4127dc1ccc88fdf5c05bba8f53fc1ff29b62920590ab1d30b940c0a6ffb334d6305376119320c188700ef5321d2d66535b6765eebf061cfd352 SHA512 c9e953dd0b71b52e8841a9f9e69f0f65699e279ccbd5f45b431ff20b69b3a637020f2e8fd0061818df68b1134bead931d4b1f776e71a2041573f435d3792fc1c
-EBUILD qtwayland-5.15.3-r1.ebuild 1142 BLAKE2B 1e45d99fc2bed2108acf77aae3959e38e5fe2541969dfaccd12d8232aa91c092244b50e0800ae6132e156553a31a5799edf99cdf572c43fb7e9d5a65ade426bc SHA512 f1ccc708436f47baff6b78d8a3fced60ab121021ac59be61c82c0ea8fd6235cf89f5ab7e943b7c0fe04e85081989ca80df5c3897235e72980be7f57adad00804
+EBUILD qtwayland-5.15.3-r1.ebuild 1140 BLAKE2B d77564631bb1bcb235ed75f85d8db4118d4bf144c1183936f319557eb0df0b4ffd45b3680bf3b8d84e9ead3298fc567fcb024002161cf116ab2955533a1e62bd SHA512 9e34ccb4bb2904fe21006d4de5a6eb617eabcf2546d07bf410f01bc17637c7f4dcabc2c75a3335a6d6b615437b924e2fda0857165b14b70398a4f835f83f07f8
 MISC metadata.xml 584 BLAKE2B ad42909b120209835e121a29de558d338bae4348eb55e69a94e8ac8b54f26564df0a750839bef9418ae8056a0d24f234615247a610b8287f5b0fbffbc60193f2 SHA512 86fd81d63b19fc6e95bdcb92e9da9b03861248a4e78e9de36aca6996e61644ab8bce7a60ca22ee7ad86fefc9b407a1fd0136240b8fdfa3c40a149444ab1dcbe2
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch
deleted file mode 100644
index e0c18228ed0f..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-fix-qmake-deps.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 3b72261b8b06397a532a40e41103c6b7a44e3ab5 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 4 Feb 2022 11:07:36 +0100
-Subject: [PATCH] Use proper dependencies in compile tests
-
-Use the dependencies as found by the "libraries" section instead of relying
-on them being available in the default location (e.g. "-ldrm").
-
-Additionally, VK_USE_PLATFORM_WAYLAND_KHR requires <wayland-client.h>, so
-add the wayland-client dependency.
-
-This fixes those tests if e.g. wayland-client headers need to be found through
-pkgconfig.
-
-This part of the code changed completely in Qt 6, so this is a totally
-different patch and not a cherry-pick of 5fc2e1915c3a
-("CMake: Fix qtwayland feature detection").
-
-Fixes: QTBUG-100475
----
- src/client/configure.json     |  8 ++++----
- src/compositor/configure.json | 34 +++++++++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 9 deletions(-)
-
-diff --git a/src/client/configure.json b/src/client/configure.json
-index 2f424580..29222357 100644
---- a/src/client/configure.json
-+++ b/src/client/configure.json
-@@ -149,8 +149,7 @@
-                     "#endif"
-                 ]
-             },
--            "libs": "-ldrm",
--            "use": "egl"
-+            "use": "drm egl"
-         },
-         "vulkan-server-buffer": {
-             "label": "Vulkan Buffer Sharing",
-@@ -168,7 +167,8 @@
-                     "exportAllocInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
-                     "return 0;"
-                 ]
--            }
-+            },
-+            "use": "wayland-client"
-         },
-         "egl_1_5-wayland": {
-             "label": "EGL 1.5 with Wayland Platform",
-@@ -183,7 +183,7 @@
-                     "eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_EXT, (struct wl_display *)(nullptr), nullptr);"
-                 ]
-             },
--            "use": "egl"
-+            "use": "egl wayland-client"
-         }
-     },
- 
-diff --git a/src/compositor/configure.json b/src/compositor/configure.json
-index bcfd5215..da95d07b 100644
---- a/src/compositor/configure.json
-+++ b/src/compositor/configure.json
-@@ -7,6 +7,31 @@
-     "testDir": "../../config.tests",
- 
-     "libraries": {
-+        "wayland-client": {
-+            "label": "Wayland client library",
-+            "headers": "wayland-version.h",
-+            "test": {
-+                "main": [
-+                    "#if WAYLAND_VERSION_MAJOR < 1",
-+                    "# error Wayland 1.8.0 or higher required",
-+                    "#endif",
-+                    "#if WAYLAND_VERSION_MAJOR == 1",
-+                    "# if WAYLAND_VERSION_MINOR < 8",
-+                    "#  error Wayland 1.8.0 or higher required",
-+                    "# endif",
-+                    "# if WAYLAND_VERSION_MINOR == 8",
-+                    "#  if WAYLAND_VERSION_MICRO < 0",
-+                    "#   error Wayland 1.8.0 or higher required",
-+                    "#  endif",
-+                    "# endif",
-+                    "#endif"
-+                 ]
-+            },
-+            "sources": [
-+                { "type": "pkgConfig", "args": "wayland-client" },
-+                "-lwayland-client"
-+            ]
-+        },
-         "wayland-server": {
-             "label": "wayland-server",
-             "headers": "wayland-version.h",
-@@ -151,8 +176,7 @@
-                     "#endif"
-                 ]
-             },
--            "libs": "-ldrm",
--            "use": "egl"
-+            "use": "drm egl"
-         },
-         "dmabuf-client-buffer": {
-             "label": "Linux Client dma-buf Buffer Sharing",
-@@ -176,8 +200,7 @@
-                     "return 0;"
-                 ]
-             },
--            "libs": "-ldrm",
--            "use": "egl"
-+            "use": "drm egl"
-         },
-         "vulkan-server-buffer": {
-             "label": "Vulkan Buffer Sharing",
-@@ -195,7 +218,8 @@
-                     "exportAllocInfo.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR;",
-                     "return 0;"
-                 ]
--            }
-+            },
-+            "use": "wayland-client"
-         }
-     },
- 
--- 
-GitLab
-
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch
deleted file mode 100644
index b861cebe60ac..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-fixup-mutexes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From bf4335b1ea9b179076cbd7a1c2e8cfa9538b1dc1 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Thu, 3 Feb 2022 14:27:08 +0000
-Subject: [PATCH] Fix up mutexes for frame callbacks
-
-Everything related to frame callback timings is used by potentially 3
-threads. Access needs guarding.
-
-Change-Id: I9f22390c175d9f2f63d31b1ebf0cdc0b830be937
----
- src/client/qwaylandwindow.cpp | 14 +++++++++-----
- src/client/qwaylandwindow_p.h | 10 +++++++---
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 7aee362a..72e0e601 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -256,8 +256,12 @@ void QWaylandWindow::reset()
-         mFrameCallback = nullptr;
-     }
- 
--    mFrameCallbackElapsedTimer.invalidate();
--    mWaitingForFrameCallback = false;
-+    {
-+        QMutexLocker locker(&mFrameSyncMutex);
-+        mFrameCallbackElapsedTimer.invalidate();
-+        mWaitingForFrameCallback = false;
-+    }
-+
-     mFrameCallbackTimedOut = false;
- 
-     mMask = QRegion();
-@@ -1142,6 +1146,7 @@ QVariant QWaylandWindow::property(const QString &name, const QVariant &defaultVa
- 
- void QWaylandWindow::timerEvent(QTimerEvent *event)
- {
-+    QMutexLocker locker(&mFrameSyncMutex);
-     if (event->timerId() != mFrameCallbackCheckIntervalTimerId)
-         return;
- 
-@@ -1200,15 +1205,14 @@ void QWaylandWindow::handleUpdate()
- {
-     qCDebug(lcWaylandBackingstore) << "handleUpdate" << QThread::currentThread();
- 
--    if (mWaitingForFrameCallback)
--        return;
--
-     // TODO: Should sync subsurfaces avoid requesting frame callbacks?
-     QReadLocker lock(&mSurfaceLock);
-     if (!mSurface)
-         return;
- 
-     QMutexLocker locker(&mFrameSyncMutex);
-+    if (mWaitingForFrameCallback)
-+        return;
- 
-     struct ::wl_surface *wrappedSurface = reinterpret_cast<struct ::wl_surface *>(wl_proxy_create_wrapper(mSurface->object()));
-     wl_proxy_set_queue(reinterpret_cast<wl_proxy *>(wrappedSurface), mDisplay->frameEventQueue());
-diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
-index 3ff68ccb..025d7917 100644
---- a/src/client/qwaylandwindow_p.h
-+++ b/src/client/qwaylandwindow_p.h
-@@ -226,13 +226,17 @@ protected:
-     Qt::MouseButtons mMousePressedInContentArea = Qt::NoButton;
- 
-     WId mWindowId;
-+
-+    // The following are used by the main thread the render thread and the event frame thread
-+    // Access should be guarded by mFrameSyncMutex
-+    QMutex mFrameSyncMutex;
-+    QWaitCondition mFrameSyncWait;
-     bool mWaitingForFrameCallback = false;
--    bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
-     int mFrameCallbackCheckIntervalTimerId = -1;
-     QElapsedTimer mFrameCallbackElapsedTimer;
-+
-+    bool mFrameCallbackTimedOut = false; // Whether the frame callback has timed out
-     struct ::wl_callback *mFrameCallback = nullptr;
--    QMutex mFrameSyncMutex;
--    QWaitCondition mFrameSyncWait;
- 
-     // True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer
-     bool mWaitingForUpdate = false;
--- 
-GitLab
-
diff --git a/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch b/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch
deleted file mode 100644
index c2e377cff054..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.15.2-guard-mResizeDirty.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 2e2042aa18efd1389a140a5d0028d8359bd455a7 Mon Sep 17 00:00:00 2001
-From: David Edmundson <davidedmundson@kde.org>
-Date: Thu, 3 Feb 2022 19:42:33 +0000
-Subject: [PATCH] Guard mResizeDirty by the correctMutex
-
-mResizeDirty is used in the GUI thread in setCanResize which can be
-called from the GUI thread. It is queried and set whilst the resizeLock
-is held. We need to guard our usage.
-
-Change-Id: I5f8dcf8aa2cb2c4bb6274103df1da9e3e268605a
----
- src/client/qwaylandwindow.cpp | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 949374b1..7aee362a 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -357,11 +357,12 @@ void QWaylandWindow::setGeometry(const QRect &rect)
-         if (mWindowDecoration)
-             mWindowDecoration->update();
- 
--        if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize)
-+        if (mResizeAfterSwap && windowType() == Egl && mSentInitialResize) {
-+            QMutexLocker lock(&mResizeLock);
-             mResizeDirty = true;
--        else
-+        } else {
-             QWindowSystemInterface::handleGeometryChange(window(), geometry());
--
-+        }
-         mSentInitialResize = true;
-     }
-     QRect exposeGeometry(QPoint(), geometry().size());
--- 
-GitLab
-
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r17.ebuild
deleted file mode 100644
index f0296f5c97fa..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r17.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
-
-KDE_ORG_COMMIT=867540b9d913760a847ff67c8694d817c821f2c2
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-SLOT=5/${QT5_PV} # bug 815646
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-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
-"
-
-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
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild b/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild
deleted file mode 100644
index 715878b3b4d9..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.15.2-r20.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=d6a6b727832819d118199f7016c2c401663ee370
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-SLOT=5/${QT5_PV} # bug 815646
-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}/${P}-QTBUG-90037-QTBUG-91264.patch"
-	"${FILESDIR}/${P}-fix-qmake-deps.patch"
-	"${FILESDIR}/${P}-guard-mResizeDirty.patch"
-	"${FILESDIR}/${P}-fixup-mutexes.patch"
-)
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
index 2c07d29ec9f6..02f088b94a61 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.3-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wayland platform plugin for Qt"
 SLOT=5/${QT5_PV} # bug 815646
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwaylandscanner/Manifest b/dev-qt/qtwaylandscanner/Manifest
index 282145658ea9..4e48a3767a04 100644
--- a/dev-qt/qtwaylandscanner/Manifest
+++ b/dev-qt/qtwaylandscanner/Manifest
@@ -1,3 +1,3 @@
 DIST qtwayland-everywhere-opensource-src-5.15.3.tar.xz 565004 BLAKE2B bc146caf77d42436dcb599df8d2aea422ac8717151dee91b9be129b97902d5af274dec90bd5ffceef62512515e5cf57a61ab773cfc6c13742a6cc5d9b6f72726 SHA512 0a9768282170709050490fb1b9daef59c21c8b5c4785f56a452d7954ffb6f016ec836022693941c99c5c10b2c3c55c75ba37fdad09dd1e0cde627f8b87b90c89
-EBUILD qtwaylandscanner-5.15.3.ebuild 496 BLAKE2B 4d395b848f07454b45a09681edac822d6efc8dbb38271338458c5bf584627409c1b5bb6a92272cd4d98077e8633da4a43fdd8b90ff316e2ca1be0eb350f20fa9 SHA512 a6c7ec08d992ee672dbb3bcc8c16630efde17520a33cc953e7b71b6c88d1ad8abf98d93605769cf7fd9d2293bae5d45339db26e266502e5af6b901bbc8f26728
+EBUILD qtwaylandscanner-5.15.3.ebuild 494 BLAKE2B cedf94150eed4b2edd9c43685a7e4c9be8145f2c8b718f257db499073fe1149e58a8e49c2ced53a56a3cb08a540d2a8f1ca5a096940977c6a34f8b6bf30f7e29 SHA512 fa35ac4052ff42cee4506d96e78c64ab873a740bef41370ef9a0f54268c479c7948eb723d396f052194c2212789bb13a6631a0055a63091c541d7653c296c051
 MISC metadata.xml 352 BLAKE2B 7354be163c38b0299856f17a85621782e367e3186e0cece5d55a29d4848ba95a7d0ebc4e1614b9ffa3de21bad70c7c7ecc86fd81a0cb83038c619a1e763fc211 SHA512 cc03c3e78ee03f9be941ce1b54ee4ffa5655c933d2cd4c2bcc252a447632ed0587d41c4d07b9e1738aed5526b4f0b934342cb99d196ba3b0f49b762bf1de7c7b
diff --git a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild
index dd0d670c96c5..99a2c9235d0b 100644
--- a/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.ebuild
+++ b/dev-qt/qtwaylandscanner/qtwaylandscanner-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa 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 fc084718c2a4..838fc1734b5a 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,6 +1,4 @@
-DIST qtwebchannel-5.15.2-fa8b0710.tar.gz 383826 BLAKE2B 3e9e9810735d5792340019a9a96cdbfeeb1259f4bd63e978c89bd3e40405c90e346ca126c9414bbe89e3c0541207fe5250ecf9a6358af8774dcda1e692e7e5b8 SHA512 b7ad0ad1b7749abf0079dac1b175eebc36b563b8a56930653a4422f98f982ae140006318853cf8daf7c5f4dab32fe418a723fb8819d1882c00d8f3ae45dbe5a8
 DIST qtwebchannel-5.15.3-gentoo-kde-1.tar.xz 5780 BLAKE2B 427f26490410eeff0a2c8fe161724dbefb185188db18aa929a86c54634c589101db8718e7bf7f71d858e068da8d25dc7f9e029961c0c92d26ad894e6eedfc262 SHA512 a041f4f451e5522676d6b4b8a5600faab2dfa81f5d413b6bd94801f11e26a25a36332c317471be99658a7c075ea2d53e0ceaae9a7249524668bb7c09e34bbb05
 DIST qtwebchannel-everywhere-opensource-src-5.15.3.tar.xz 209116 BLAKE2B 08edc7a3fdb5556274bc7b746dfcd1e46c64c019c30c171f6c25202aee22335a8fdec8cb1e94dd60ffcf70b245bba67714374bd2d3b55b7ede7ee7fbf2e6824e SHA512 77ec10187601c826d15dad9a5112553bc1f954d11f54a40d38a2e1a1cf7412fe2c74e0b100c91befd8be06274dc537dbed4c6f858856a3b38974a363ff380415
-EBUILD qtwebchannel-5.15.2-r10.ebuild 638 BLAKE2B 5988a858319784a64e3b710ea6bf05246f7106f9ec858ff6e2fa3ca345b75b9ed19e9dc74871dfa688e0d6ab64509527587ce993aef949b3b6f17bd833e04073 SHA512 6511ead67bc24956a6def8b8503321100e2c5490638b3a2256d430d3fb8f023bb3252e6f01fff298c59e94769248c6b8a8a8d9bc7c371e64b4dacb23dccb3057
-EBUILD qtwebchannel-5.15.3.ebuild 605 BLAKE2B dd4a6d398dd0487d04f51f25bcf7a04b6e868b3821aa18860acad1098d1ed772fa9f867231cbba36a9e0e5b451e6eb67b17cc8bb85b300143ac4a2f9f1c9141b SHA512 621057c00a35779b0af8d17831aa4a53a0318e5aaf7e673ba8d58fd467b68085fa89e4078f9c55e5cfdf78b0222118bcbfa35fc8c6f4ba687d394f91951f8707
+EBUILD qtwebchannel-5.15.3.ebuild 604 BLAKE2B 7c990056bb14f9a555a9de45ee52f26f2f0afa103475edb0e54e55394443e242941657c659ef5166c2ae2d94521382a9c163b081b5c3f6879cc5865fb2074038 SHA512 4bac324583c4ab4a1bfd9ad7d7e144ba8c4310079fc91f4fe78fbe24b5e058652a729bf391937653ff1200b5e7c29787060e1376f26a884d4bd0cfc6f25dbf85
 MISC metadata.xml 562 BLAKE2B 89a71be78fc40c86d01afd963f8a8519410086f36b572707e8029ea58e900d7e9563eb1b94fec26c2e078395bfa9ef20149fd8c0b2a5d6c3699198890215ebe7 SHA512 85467596f68320b2cd8440f9587f88992d36915b906a5b9139b29e07a9db9ca31853ae7c379bf90e9178e407ab3e526187ed761cd8cfa155658491ef68bbcf30
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r10.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r10.ebuild
deleted file mode 100644
index fbdcac63f8dd..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.2-r10.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
-
-KDE_ORG_COMMIT=fa8b07105b5e274daaa8adcc129fa4aa0447f9f7
-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.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.3.ebuild
index 99d83479ca0c..648e932a01a7 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.3.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.3.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 2a16876abd71..3941f5e365db 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,14 +5,11 @@ AUX qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch 7361 BLAKE2B 0a5ab90
 AUX qtwebengine-5.15.2_p20210224-disable-git.patch 501 BLAKE2B a295e5061830da6bfaf0c0ae6db832c86f797fa2426ec29e244133e862c0998a03373c11a2a31944bc09e0a20bf30c0a0a91eb06b1f8a9fdcdd9762f5ba7c542 SHA512 b795328058be945e7a323ea50f01cd5c11b130bc1204c8274fec920e04cce1643d8f9313e975f451dbb7dfecd6214f9ff9ea0aec87ad29237b6e9bb1b4114c5f
 AUX qtwebengine-5.15.2_p20210521-clang-libc++.patch 358 BLAKE2B a03de632ac4e01cf56c52af3a3bd5ff5bcfd525c67bf2e5d960904a9f3b53e1fa18f0e0df380c0cf84f17914fb313a028e26efaefe6ab5057f0d9a9cf2f6f0fd SHA512 6dc3864064d6084e70d4696fda744701c293ee62e9c9088e3247988ffb8085f30c632e94ac19aef715cbd211b21dfcb98691d5809e21cffd9f04bbb8b04cf0da
 AUX qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch 2182 BLAKE2B cc19cc0c1242f7193f62a550ceb6358e43fcbdf6f95ddee373a3a775448908d6d0a661c6406e6c7578013a32ae280198263a94804e76c87e99db064dc972db7c SHA512 8890ab95300c148e21315a201ac56d04aca1ccc402e464b6ec1b90a69127a4fa02398893007f98eb40ea78d0abe56d459c34eba3c5cdd1521d4ab567225bced1
-AUX qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch 977 BLAKE2B c75ae3b6a8852e3b7369c2f24d55a69a99ccebaf4aa25ae53e36d99285fdd46d32b1a9eea9a374cc004cb70c7c17383412bc5b73261e71ddae7f576025ee8678 SHA512 f7dcb498ec96c74ad969de5455aec3d952bcec3f210f49e18e8936746ef05ff0e11464c1278af223bdfed815321cb043afd678c0c4eeab81a022cd4e65fa6128
 AUX qtwebengine-5.15.3_p20220329-clang14.patch 1883 BLAKE2B 9f4afae3ea240841f8b009df0cc71f9f23361f5205a3ced968b6ddaaf36b16fb880baffe4f4eb0def9d45fa267a7a4e43dcccacc47ea474e0914f4159877ee56 SHA512 8de250760738386799523b3ad29dfae37120a69d4d469274e96d80ade8b26afad39f54651ec80b8a17ac5b2083193283b167a0ed0438b1d926e45ff69f067a14
 AUX qtwebengine-5.15.3_p20220406-ffmpeg5.patch 8393 BLAKE2B 07dee5bd305699378353796fc6c9f06daba31d9c152c565fa9391215334b064cc926915e7d47a7d1361f8a209ea812c7eea79bfcbcbbacb49cd79d77454b5962 SHA512 12b735976924c916654fda5582239354e9ef0f99ea1ba0e768b2225b29bee4bfd10ca6d3a861874bd310ed3afd885696e78d678e84be85458efdbc16cf1039d7
 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.2_p20211216.tar.xz 318953468 BLAKE2B 65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2 SHA512 f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
 DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
-EBUILD qtwebengine-5.15.2_p20211216.ebuild 8492 BLAKE2B c7a0703cf11aafc9761cb1826ca6b0d539f374085cd5397ba16f348a57453ce81679310b7dd2d6f9ad6f3f1cece897a9457178e2a1058b5a3604f3365e13b153 SHA512 f6cfa9f0fb79cda2772bfed848bdf88134f853a354d34ddd384566933faf0b63b241a9563042b87dd88c8be6095e3bae5230906928e5a8b41eefa9c79d8d1e67
-EBUILD qtwebengine-5.15.3_p20220406.ebuild 8898 BLAKE2B feec2589c86ea28788fd23e612ca82adcfe6bdc0ea253cd5a637fb9cbd732bbc7448b0e41277a68322ca92340b5e5df32c3c9e5ddfd29f1749f340d3b77fff8f SHA512 cf5fa6b59417201482b3f984420c3f82be0c718bbfcf911bab9391f819752118b6baa6d23298b8c6b514f1c5a6dc2c69080b2459c48efbcbd433e8c74f5f3797
+EBUILD qtwebengine-5.15.3_p20220406.ebuild 8916 BLAKE2B 18f4872bc991ce6485c8d1a9dda7c6f213a8901f3f7b15198098522067fb21415d23b3490ca22560504937def07ac6579c00c0f95394c5339acc900e5d1b49e6 SHA512 31fed35489dc2ec2fb9dcfdb33f761e53925e32ccd40e1f43796a907fe7dfc38c45e4e883fc015541395dadc51697c121f2cd3f09fc25c1bf05d029b15a0c773
 MISC metadata.xml 1379 BLAKE2B 67b694ac104e8f16a0bb4a33bd178b4507b5c411d62634d88dd8187dd27b32d6a11829883cde03c0a856134c498df7d6c946221a05fec356e62296b64add4121 SHA512 afa7bd418df63335a1b6ad7f1a53be74a710ffaaee294a1db7691ce98d45d2e98e3f40c2e47e2e9e89f766122392def7a3c2198680413c647c9202c1f4c2f0e7
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
deleted file mode 100644
index aac512a368d7..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch taken from www-client/chromium:
-https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-glibc-2.34.patch
-
-Dropped parts already upstream.
-
-diff --git a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-index ca6b595..1c1ee42 100644
---- a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-@@ -11,6 +11,7 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <stdio.h>
-+#include <string.h>
- #include <sys/syscall.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() {
-   // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
-   clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
- 
--  char tls_buf[PTHREAD_STACK_MIN] = {0};
-+  char tls_buf[PTHREAD_STACK_MIN];
-+  memset(tls_buf, 0, PTHREAD_STACK_MIN);
-   tls = tls_buf;
- #endif
- 
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
deleted file mode 100644
index 55f8f5631a65..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-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
-	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 +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:= )
-	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.2-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.2_p20211210-sandbox-glibc-2.34.patch" # bug 828099, systemwide-clang?
-	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-)
-
-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.2 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\.[3456789]/${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
-
-	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
-		./generate_gni.sh || die
-		popd >/dev/null || die
-	fi
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 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, with"
-	elog "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.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index 6d206e2f1198..6a665711c4c2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -233,7 +233,7 @@ src_prepare() {
 
 src_configure() {
 	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
 
 	local myqmakeargs=(
 		--
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 22dcc5c93361..8a75b92d7614 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,6 +1,4 @@
-DIST qtwebsockets-5.15.2-b13b5690.tar.gz 434726 BLAKE2B dfc5f4fb3031a3ba689f520f0914b61bc815205b474590662d152cc79f29f00f4ad85930a9fa61f44545eae6e62f0e781db80d9ad296e122b5049bf096568349 SHA512 fd26f93e8b5395ff9ffb7d8ca2954ba031f6d680126d76b8c1ff82fdbfa99c19cea1e05518a281a7b8ea92f6dd1410393702c91507bca03c650f3f0f490b5e3d
 DIST qtwebsockets-5.15.3-gentoo-kde-1.tar.xz 2044 BLAKE2B 7f7b0ab24f0347d838d66cbb46968c8ed11016b6b27394c7eb13c5499fb089a744cfd806099414710feb28b7ce985bbb646f6e8374e37d048fe633e63bb55bde SHA512 05551f72e5a887ac771f9d5d8048e5d71a5740a03c676c864379a230baf51994cfa91008ad4d7b4d347afafbec12a9aeedd1f51bcfb4f30847a2fcd08ef85a05
 DIST qtwebsockets-everywhere-opensource-src-5.15.3.tar.xz 259184 BLAKE2B d37056edef6a8618f773c5b51d3e3d3d48e996ddf27b04129a9b2ef4e313405018ec0325482d2157245f31fc25e3938a03d2aab773735269930c4cb175593ef0 SHA512 a4d1442028e842f5e97bb5d9142d2be768193a0807e51a72adc36bf9bf554fd3ae86373d3de841dc6e0c8bd8312d7bc23b2e46fdf90fce59ab5e35e4462ce4ea
-EBUILD qtwebsockets-5.15.2-r11.ebuild 617 BLAKE2B 63989ccb4c7b29aa7f5c77fb3e6cf50cf521d3e49b285a87fb3a7dceac4928ae63db807667d8cbd0f2a4213017e72f05cdf76d3a5c763621f9fa652ee10a5d37 SHA512 03caac0fd9004b15be77e2a429f63c69051cee50c42cca2ccc7a52654e41828950a9b0653cbbe0d9deb2f27cdee4114eada04051bba6814b124e67ee7626312b
-EBUILD qtwebsockets-5.15.3.ebuild 584 BLAKE2B fd83042c8cd6631d66d9493f8ef6aea0f959bb603607075aa64fce2d40b795b4ca8b835d3c12adc6ba72da132fcd6331c5fc9f064c88f2300a490551003aa8ff SHA512 5278598f55e2c9fa01575f2b54303bd3c0d69e4d49ce9c86ccd4791fff624e9bdd4883c08594461c3d2dc4d9f4fc57aa7d48887cf73c0f275b5d9ade36136087
+EBUILD qtwebsockets-5.15.3.ebuild 583 BLAKE2B 03765c46170ca5eb45df9f2773b60ef2fc126c9bf14bea4fc084f3984c3fd16a804de1625577da27658af0201c486f3a3ca1dc3977cdac546456954717cb707c SHA512 0fe201988a3af2a80c11da78c23e99f88abdbe45228284a24cafcc582118764bf761b5157476076bf1d448479ca874e7d83d2d39036cc386da4611dc5f28e57b
 MISC metadata.xml 542 BLAKE2B 45db7e0814cd2ecae2053ed664d6af55c1f2c175eeceba4364fc37c558ddb51c8e28309722e8c2404441ca009613c045ddf7e501d4b5ed27d208c027c3aa1573 SHA512 5bc7be4d72823fdb716ce7eee0c36eb2a5fe7ea9a59a95792727efbddbe474fb44dfa0286a3064ee674a41d8d5415fd48c717735b6818cf3c28e1d60193f3ce1
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r11.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r11.ebuild
deleted file mode 100644
index 28a5f5b9d771..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.2-r11.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
-
-KDE_ORG_COMMIT=b13b56904b76e96ea52d0efe56395acc94b17d96
-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.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.3.ebuild
index 01cea4901716..a8691a3b4e74 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.3.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 b90546807b39..05ca3510f6f6 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,3 @@
 DIST qtwebview-everywhere-opensource-src-5.15.3.tar.xz 133700 BLAKE2B 7ca5b2e18f08a7a7dd08ff7c835e796dbba5dfd77deaed0e5909d1622d478de69e190b68b3f02e4c48ba04fd37196ea63297ffea4f6e999966b3938944491614 SHA512 3a2a7c06df79a6ac4bfd3a45c2ad9e06dc1c2c71ca6a14f9006e031b0679549a9f1d09a9c82439c700e1c0c0785cf7baa402ea2d230a4ebd122dc4e5d2b07030
-DIST qtwebview-everywhere-src-5.15.2.tar.xz 133428 BLAKE2B 64cc9ff6a14c9107eb1607cbf244d179fd78ab5fdc879cce85c5f8b85dd738452b681faf864bf0013d3c8614ab2bd593fbf5ddb603ee2d2a0e0f684f9a46a0e2 SHA512 11502597d5e3a9b8a3a90025b56c086a3412743019384558617c397a8ad4a0f646b406a4fbeb31ca45e6e573d1fb06cd5b22b8c0179695d06cc3d492289a1c85
-EBUILD qtwebview-5.15.2-r2.ebuild 454 BLAKE2B 1a77a9737d81ebdc5d2e48a4a39ac3e86433654ac6813616f4385ab2cf123c56d75b3a125b2f93c42e2d8851b513d164924ec9190d5649be51e6f9f4bd93b4c8 SHA512 258a38caff68707a51f8c1daaad9fcaf6cd38f309e455fef97280351e76252fd970dd9740a2c047477399f781e0fb5a3944038b4247465ec116652142358b32a
 EBUILD qtwebview-5.15.3.ebuild 454 BLAKE2B 8f380ecf5efbd5e38d4b94e224cd191d342bc59c9730a929f6c1c6f5f68ff64e5b3b3604970396f05e7c7ce757d92c8a9b82868a37136b7ebb34f4ec94a4c35a SHA512 6ecad94dcfe6a2517a1af4194aad7ca2696d066bb2483ca73c8d45495c8389d1b59358dad8d71ef5a84fc67bc384dee6b141772cf0438a6edeae22037c57843a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild b/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
deleted file mode 100644
index 29f8f0036120..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.15.2-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 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 4e7e322f0b2d..0366743c0bdf 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-f4ac0b55.tar.gz 67967554 BLAKE2B 3e1ece861c195cdaa688f22cac7bbfdb3cce73ac575f72c8adc916face612307553d98da7b757c44980b1ed0ebf5a9ecaa2e993b41e775f511e32bd515c1ca54 SHA512 6160e02505e4d3f9fbd55f442e0a7a4d906feb576c891600232937bc212660b5c8a41072347d9f78dd0a1ca9357af514b5df2b341e181b2c823b36a912e583fa
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtwidgets-5.15.2-r12.ebuild 1229 BLAKE2B 7fbd2126ef2e830bbda8f3f4dd83f6a98581f2e671b4946d2247de0e85b398a340e557bb614c69ccd602918acae51cef0ca3961ff968bf7be476fa774cf3c49a SHA512 12a70fe42cae892c9e169b8992fa2cc2bb2884e28c6e977eaf62e18c9e1aaaa570f2cae04471a7c1610c98c5c3b9e98f70d4453803aac71049eaee72f3e61401
-EBUILD qtwidgets-5.15.3.ebuild 1197 BLAKE2B de72dae0d6d8b6d1ab397ae76d67cac4ac016f207eed3e6cb46cb21188e0aa9753a8ac48169880c9bb79c03ac6f7036063d341cdb6a643ec282a5358e1baf78b SHA512 9695428b436501215cf724f401e095e585a8c705dfd9de07c95603269360e2eca7316f0005230d2d55b65edf00e23bf76fdd3825e086812729473d78b3badb23
+EBUILD qtwidgets-5.15.3.ebuild 1195 BLAKE2B 45122f3ba71a6317214797a0caf6ebe0cf904864df95ec158250bbcc082ef473716422a963a9ca8a3e62914e94824e3a873bdb9c0214102c6c189b65eb9c4c1b SHA512 d6ea638d68a94a8131c6be95ae71b6c44db7cc0edc4f5bcc9937589cbfcf8d23bdd213e8aef337eaa23820ecf8743df579224fed76505912ca9d493395e70b14
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.ebuild
deleted file mode 100644
index 3b8302515b6a..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.15.2-r12.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
-
-KDE_ORG_COMMIT=f4ac0b55c37f2b594ffbe639db43dac365825c7c
-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 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.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
index a862a20ec317..6c6b044b5b8f 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa 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 2609945f7d94..244c65ecab02 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,3 @@
 DIST qtx11extras-everywhere-opensource-src-5.15.3.tar.xz 143996 BLAKE2B 5e6fa4d15c6fd16d81d4923cdace8e90baaa2b6484667a516890b4c6da5befa61205809bf4f52273bc25747b1d7a6355b8f85ecbf891a0d97548362a01e0acb2 SHA512 eaf5e639c68cc4e1a35f82a877f461f8023b92dede3819808fdb7334364f4428400a94e7d8cff30985410bf7754258c6376504fd068ba3d792683fd23f586133
-DIST qtx11extras-everywhere-src-5.15.2.tar.xz 143972 BLAKE2B 7dfa2fcdad254280bb00f40722e5ba4736ed89a1dc6b3542738a0492fe74a5f0823aefc141938bd7b0e839c7ee0b72914030b368cf4e33101e1e056e4a8d2ca3 SHA512 beaefc865299f4e7c637baa96eb3a69adbe1a41fc7735b46cfec0768c9243391600e69078630fffb4aceba106b7512fd802e745abc38ddab5253233301c93ed9
-EBUILD qtx11extras-5.15.2-r1.ebuild 452 BLAKE2B 68d15adc17ef5dc066030d53ada160ec18fc602e7751cf5f8154dab498100ad9a2b598b19f80333b2a25c1ef020b53b3348f8cbc6f06b580806920b99dddc86a SHA512 c77dd842d7529d45a8877f9623297f2677be3be3c6eaad7ea8fe076db3283d13a21bdee90f67b6858f574064b85e400aff4a2a2ae1b58cf39aca434a8e176902
-EBUILD qtx11extras-5.15.3.ebuild 454 BLAKE2B b7c6159303e6d5fc52782f36b00b8685ac4c4a9c344cfddc8e3f9ad153e417ceef788f48f6537bc681b613e5f18f7fdbe73dc45f7be6c9e31952c1c34e12e3c5 SHA512 4d36d1bc6f62b74602e6074f684a94d34f9c250b93ede4fadc6eea62aa90f69e4762761f4ed6550fa7f8fa81a0dd1452b8b51e6fa2b5a60fc8a3b19dd88659a5
+EBUILD qtx11extras-5.15.3.ebuild 452 BLAKE2B b656ce186a73820dca95a70df22be14900718d2040fa7bd31f55dd02e8d3bc48bfb6874e1ab5c3945cf345af6633161242860ed23b646927e821b74aaa1eb168 SHA512 18ab71f09f5b0454583af9531d738c8d6277f92c183a533beffa8f310f8e9eb5db9c22bc1966408c4eadad3f193c7c17978192c0c04b6f16177e670bf7c1b57d
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
deleted file mode 100644
index 0174763a58f6..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 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 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.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.3.ebuild
index 946e8f06f500..d72499e0a523 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 644c0bbad435..3f5b539e47e0 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,6 +1,4 @@
-DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
-EBUILD qtxml-5.15.2-r10.ebuild 567 BLAKE2B 72c6b122c77c7fb5e02125cdcdf6e8820b6813cbc6c096afcc52d819b0141a4a8b2238e151209a360931740746bebcbeb75109a36eca04cd579bb9785db48f12 SHA512 c0a87047c69cc6d11a66792697dd3487054882440f08c063c44f474a626e5304ead7adaca096b4ba45b5935d8c2df7a8c250de5d9c1f02094513d2e66415a82f
-EBUILD qtxml-5.15.3.ebuild 535 BLAKE2B 95c32cba690c77f7f5df275659a384a984c8eb0bd7ae4131882708e6211d09e92a013716dc32df99660877ce209325d12690a2ee56cea3920e0a845ef37ffe19 SHA512 d6f487bf5d57a65ba53e425640703d0fd28c6069d831dc71b823c6aab272cdf170286fb53482910519239bf739e0a78fd0f0e1c0de286b469484f61d4a361043
+EBUILD qtxml-5.15.3.ebuild 533 BLAKE2B c27a9bf10f018fbaf27de0aaf5b1cf5e5e58c56f6797ef59f6f9b71bf0311ff73385f7c3c507eb7e86aae2e458660638f5437ba7f7e0d385626a5b11a1be91b6 SHA512 a1e45f85606944de7de75f28cbab85c02b90e0e2e2a88a7e042c47eacfbca4dda52ee8a7e0fa4e92aee9ec7537db1bed5c53f242aa2b0f84aac267213996673a
 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e
diff --git a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild b/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
deleted file mode 100644
index 23f2c1e9e280..000000000000
--- a/dev-qt/qtxml/qtxml-5.15.2-r10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_COMMIT=a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd
-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 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.3.ebuild b/dev-qt/qtxml/qtxml-5.15.3.ebuild
index a9be6054c420..d65df3179dc1 100644
--- a/dev-qt/qtxml/qtxml-5.15.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index f49d2faca742..f5b43b5a1a4a 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,3 @@
 DIST qtxmlpatterns-everywhere-opensource-src-5.15.3.tar.xz 5211100 BLAKE2B 808b3f047603e31a973c1455632c2b4425f2daffbe977572682155c6421062285481b7847fe21ea796991bc21aebb4be65f6a17d1d2bfeb3b0ff722b6785f234 SHA512 4a5f7d68db6f950caedbb94291ab6aad77e7c52cc8adea2e41ddf600106c8d75b4eef83bc716bb1aa3696042c48c34979d8d216a16ccec3a539118b46691c5a4
-DIST qtxmlpatterns-everywhere-src-5.15.2.tar.xz 5209380 BLAKE2B 35933ecc0b7eb6b7355e660aafc616e47a1358857f8f2b161454dcaf1f05cd0d536e27859e3380a8ac46da3b228c805ef25d267931eb71585e5f9974d3e5640f SHA512 5cdf51878f8bb42db57110acc0c3985a95af098da44e5dda505e0716fef5afc780419058158f7a8f9a0fe3fed83fd64abd856b4dbcdca20efa5e985fa85cc348
-EBUILD qtxmlpatterns-5.15.2-r1.ebuild 643 BLAKE2B 6ba7d3493d66247c29aa09cd106132774f05e649be235b0f785f40103fae21e2ea7b1e9af7d6c0de822da97e506db362fc5899d20aa310cdf029daf3220b0e4e SHA512 414a184e1a86a12e5ccf1d44c167b5fce52f0a7004bf3207ba527478fa11263781334614991f0517be8cce9f599ba7ce8987731b0ac571e29cd32c6b9f87fce5
-EBUILD qtxmlpatterns-5.15.3.ebuild 803 BLAKE2B 6db0bd39ae163d9f9e8f52f2d09608040c9f7914826142291b9ef4f132e26cc4385a9dfb5f891475a704466c4999e1d76c5847368ecd791f20bda70bd3de70d8 SHA512 1902d1ce59f41e7ffae5c4ecdc04a29527cf324da439891db29992b3db76d5eaa6ac268d85d1fb5b437a37dd18fdd8f8f90f6f0380ae87df43a9945ffeda1966
+EBUILD qtxmlpatterns-5.15.3.ebuild 801 BLAKE2B 7c427cd11fe454b218e0d6e1c066fba3e1f9aeff5cc10de3737096900a18057594bed9f7ec1b6e1f97708370b04944d9d68f93f9dd30606c85fc7586e5443b49 SHA512 f69dc0523fb04eb5b632fce2acfd6b8cc22857e60011b1429a710f56a004ad606bf1de0dc151af51da9503f0a32bcc53a3945d2cce86518448f32f5ac70c0403
 MISC metadata.xml 590 BLAKE2B 2f67cb5fc0572aa19ed1775ac6a1cf2de7aae77141a76f81ad00d9620c0ba4238c1058ed53bd6332f8862f24cb59f3f23984df84d062c295868f3914ad8efb8f SHA512 50bbcf3579ec5613429e2a7c613e41ccd79d04f0ed7bb2e5db1ae22868aea8922f0b3509bc4fe91ab7cbc9ad6b86bb536993638d3562d811203814e64e2ae22b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild
deleted file mode 100644
index 20f6cb72b150..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 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}"
-
-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
-}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.ebuild
index e7184106f6c0..5d155fc8c5c7 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.3.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 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
 fi
 
 IUSE="qml"
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /dev-qt
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)