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 /metadata/md5-cache/dev-qt
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
119 files changed, 149 insertions, 999 deletions
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index f8d051115fe0..a33ee026d953 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.2-r11 b/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
deleted file mode 100644
index 1f1cb9f9c118..000000000000
--- a/metadata/md5-cache/dev-qt/assistant-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[png] =dev-qt/qthelp-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[png] =dev-qt/qthelp-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1e83085df38b34e91b0d6134769f594e
diff --git a/metadata/md5-cache/dev-qt/assistant-5.15.3 b/metadata/md5-cache/dev-qt/assistant-5.15.3
index 8e1bc607a70c..6cdd1a2c1a8c 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.15.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Tool for viewing on-line documentation in Qt help file format
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*[png] =dev-qt/qthelp-5.15.3* =dev-qt/qtnetwork-5.15.3* =dev-qt/qtprintsupport-5.15.3* =dev-qt/qtsql-5.15.3*[sqlite] =dev-qt/qtwidgets-5.15.3* !dev-qt/assistant:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=23a133c1e9e0104c329030e65093dadb
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ec8af375888469334f9c35afc4fa5404
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.2-r11 b/metadata/md5-cache/dev-qt/designer-5.15.2-r11
deleted file mode 100644
index 87991e48e11b..000000000000
--- a/metadata/md5-cache/dev-qt/designer-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2* declarative? ( =dev-qt/qtdeclarative-5.15.2*[widgets] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=declarative debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2* declarative? ( =dev-qt/qtdeclarative-5.15.2*[widgets] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b0ee1afef1af8aef050062d10ffec065
diff --git a/metadata/md5-cache/dev-qt/designer-5.15.3 b/metadata/md5-cache/dev-qt/designer-5.15.3
index b5a79a907136..381079d07070 100644
--- a/metadata/md5-cache/dev-qt/designer-5.15.3
+++ b/metadata/md5-cache/dev-qt/designer-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=WYSIWYG tool for designing and building graphical user interfaces wi
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=declarative debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5=[png] =dev-qt/qtnetwork-5.15.3* =dev-qt/qtprintsupport-5.15.3* =dev-qt/qtwidgets-5.15.3* =dev-qt/qtxml-5.15.3* declarative? ( =dev-qt/qtdeclarative-5.15.3*[widgets] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e95c73d01a97d82e05986fa6fd2b05d0
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a19af1d52b07f8ce4fe992e5fd2f3463
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.2-r11 b/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
deleted file mode 100644
index 0d96339cd303..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/designer-5.15.2* =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Graphical tool for translating Qt applications
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/designer-5.15.2* =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=34b470a5e9d51cde2e764390257a0fdd
diff --git a/metadata/md5-cache/dev-qt/linguist-5.15.3 b/metadata/md5-cache/dev-qt/linguist-5.15.3
index cddb954c3331..847333837433 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.15.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool for translating Qt applications
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/designer-5.15.3* =dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5=[png] =dev-qt/qtprintsupport-5.15.3* =dev-qt/qtwidgets-5.15.3* =dev-qt/qtxml-5.15.3* !dev-qt/linguist:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d1a6e208ff1a2bdde3fb7f82ced512a7
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=99b9d65192ce2d057b8007c12edabf9b
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
deleted file mode 100644
index 1d37c379e89f..000000000000
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtxml-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Tools for working with Qt translation data files
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtxml-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=39d90ed7837e369d37d00df942585581
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.15.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.15.3
index 61657ec6e91e..c42808862d32 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.15.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Tools for working with Qt translation data files
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtxml-5.15.3* qml? ( =dev-qt/qtdeclarative-5.15.3* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=59dcedb47ac9d75f1dd2bff332036e43
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=1d5fd29cbfe6bcdd75f511aed2c1437c
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11 b/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
deleted file mode 100644
index d92f0cdf98a7..000000000000
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtwidgets-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt screen magnifier
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[png] =dev-qt/qtwidgets-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=6cb1a3c168ee5960a0d081468dd57deb
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.15.3 b/metadata/md5-cache/dev-qt/pixeltool-5.15.3
index c7db9ea2052f..c79fb41ce8a4 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.15.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Qt screen magnifier
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5=[png] =dev-qt/qtwidgets-5.15.3* !dev-qt/pixeltool:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=542b80f72e272a8ee4244cc362eff3d5
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=d21530cb6322489007e7fd0d1841c028
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
deleted file mode 100644
index 159b53180354..000000000000
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtxml-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Interface to Qt applications communicating over D-Bus
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtxml-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=9fc5ad0e7075a24e4aca5a3a5b03b111
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.15.3 b/metadata/md5-cache/dev-qt/qdbus-5.15.3
index d7af616a76aa..16ac16f5f66f 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.15.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Interface to Qt applications communicating over D-Bus
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdbus-5.15.3* =dev-qt/qtxml-5.15.3* !dev-qt/qdbus:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=47a2134d5bd1e73436b795e54448890a
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=6679f111fd7353b170b874e914790005
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
deleted file mode 100644
index d29f44ef7e35..000000000000
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* =dev-qt/qtxml-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1a06beed62c7168955c7add447820803
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.3
index 1b02104e5805..22e7cc7837fb 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.15.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Graphical tool that lets you introspect D-Bus objects and messages
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdbus-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtwidgets-5.15.3* =dev-qt/qtxml-5.15.3* !dev-qt/qdbusviewer:5 !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=67517a29d6619da4ba65d9ed1d5c26a2
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8ef166fc4a3cbf6c0634c3ddd1273a28
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10 b/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
deleted file mode 100644
index a1d0a64e4cc8..000000000000
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt documentation generator
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=01e0a4119836dfab0adc4970486ad615
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.15.3 b/metadata/md5-cache/dev-qt/qdoc-5.15.3
index 0ddc9382ca50..9465ffc38827 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.15.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3*:5= sys-devel/clang:= qml? ( =dev-qt/qtdeclarative
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=fbda7da59db59dffde84b5e07370a566
diff --git a/metadata/md5-cache/dev-qt/qt-creator-6.0.0 b/metadata/md5-cache/dev-qt/qt-creator-6.0.0
index 2af278ce620c..b5f09cc41c48 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-6.0.0
+++ b/metadata/md5-cache/dev-qt/qt-creator-6.0.0
@@ -4,6 +4,7 @@ DEPEND=>=dev-qt/qtconcurrent-5.15:5 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdeclarativ
 DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
 EAPI=7
 HOMEPAGE=https://doc.qt.io/qtcreator/
+INHERIT=llvm qmake-utils virtualx xdg
 IUSE=doc systemd test webengine android +autotest autotools baremetal bazaar beautifier boot2qt +clang clearcase +cmake conan cppcheck ctfvisualizer cvs +designer docker +git glsl +help incredibuild +lsp mcu mercurial meson modeling nim perforce perfprofiler python qbs +qmake +qml qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind webassembly l10n_cs l10n_da l10n_de l10n_fr l10n_hr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
@@ -12,5 +13,5 @@ REQUIRED_USE=android? ( lsp ) boot2qt? ( remotelinux ) clang? ( lsp ) mcu? ( bar
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtcreator/6.0/6.0.0/qt-creator-opensource-src-6.0.0.tar.xz
-_eclasses_=llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=78bd9a1543bfea48aefcc1cbeec654ec
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index 6e3efe08f71e..78a2598e9061 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -4,6 +4,7 @@ DEPEND=>=dev-qt/qtconcurrent-5.15:5 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdeclarativ
 DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
 EAPI=7
 HOMEPAGE=https://doc.qt.io/qtcreator/
+INHERIT=llvm qmake-utils virtualx xdg git-r3
 IUSE=doc systemd test webengine android +autotest autotools baremetal bazaar beautifier boot2qt +clang clearcase +cmake conan cppcheck ctfvisualizer cvs +designer docker +git glsl +help incredibuild +lsp mcu mercurial meson modeling nim perforce perfprofiler python qbs +qmake +qml qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind webassembly l10n_cs l10n_da l10n_de l10n_fr l10n_hr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
 LICENSE=GPL-3
 PROPERTIES=live
@@ -11,5 +12,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.15:5 >=dev-qt/qtcore-5.15:5 >=dev-qt/qtdeclarati
 REQUIRED_USE=android? ( lsp ) boot2qt? ( remotelinux ) clang? ( lsp ) mcu? ( baremetal cmake ) python? ( lsp ) qml? ( qmake ) qnx? ( remotelinux )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=78bd9a1543bfea48aefcc1cbeec654ec
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.2-r11 b/metadata/md5-cache/dev-qt/qt3d-5.15.2-r11
deleted file mode 100644
index 7c25a34dbe41..000000000000
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[vulkan=] =dev-qt/qtnetwork-5.15.2* >=media-libs/assimp-4.0.0 gamepad? ( =dev-qt/qtgamepad-5.15.2* ) qml? ( =dev-qt/qtdeclarative-5.15.2*[gles2-only=] ) vulkan? ( dev-util/vulkan-headers ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=3D rendering module for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=gamepad gles2-only qml vulkan debug test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[vulkan=] =dev-qt/qtnetwork-5.15.2* >=media-libs/assimp-4.0.0 gamepad? ( =dev-qt/qtgamepad-5.15.2* ) qml? ( =dev-qt/qtdeclarative-5.15.2*[gles2-only=] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qt3d/-/archive/dba14d48611b9e9d59576172658779ab4a39b416/qt3d-dba14d48611b9e9d59576172658779ab4a39b416.tar.gz -> qt3d-5.15.2-dba14d48.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=1ebf20fe0928a462503394d294a6c80b
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.15.3 b/metadata/md5-cache/dev-qt/qt3d-5.15.3
index ff8bfab32867..372297ae3ec4 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.15.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.3* =dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qt3d-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qt3d-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=4048eb52bc9b4acf17bfabfab3d0e84f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r10
deleted file mode 100644
index 5850c873b336..000000000000
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdbus-5.15.2* >=net-wireless/bluez-5:= qml? ( =dev-qt/qtdeclarative-5.15.2* ) =dev-qt/qtnetwork-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Bluetooth support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtconcurrent-5.15.2* =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdbus-5.15.2* >=net-wireless/bluez-5:= qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtconnectivity/-/archive/5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26/qtconnectivity-5e9ca5d36d65dadb98ef90013a1dcf15fbd7ae26.tar.gz -> qtconnectivity-5.15.2-5e9ca5d3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7bca701d48ce330a9e8471aec914292f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.3
index 010d8bfa2e01..73cbd720c5d5 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtconcurrent-5.15.3* =dev-qt/qtcore-5.15.3*:5= =dev-qt/qtdbus-5.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtconnectivity-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtconnectivity-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=0cc697441f6ca9b5a642f68826a055ae
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1
deleted file mode 100644
index 64b3840fb4ee..000000000000
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Chart component library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtcharts-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d35b5e35c658f89efcf5a277134e6b53
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.15.3 b/metadata/md5-cache/dev-qt/qtcharts-5.15.3
index 489f23be4ba8..350fa2de0287 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Chart component library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtwidgets-5.15.3* qml? ( =dev-qt/qtdeclarative-5.15.3* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtcharts-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=1c3ed29d59cfc08da3f0b351787111e5
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=92a79ec0dd2a5ba3bf633095a00a0b0f
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66-r1 b/metadata/md5-cache/dev-qt/qtchooser-66-r1
deleted file mode 100644
index c75a599f60c8..000000000000
--- a/metadata/md5-cache/dev-qt/qtchooser-66-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )
-DESCRIPTION=Tool to quickly switch between multiple Qt installations
-EAPI=8
-HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
-IUSE=test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( LGPL-2.1 GPL-3 )
-RDEPEND=!<dev-qt/qtcore-5.15.2-r10:5
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=b5f99655b8f7b1683238041dc0784c9a
diff --git a/metadata/md5-cache/dev-qt/qtchooser-66-r2 b/metadata/md5-cache/dev-qt/qtchooser-66-r2
index f63fd041c290..3c52aad157f8 100644
--- a/metadata/md5-cache/dev-qt/qtchooser-66-r2
+++ b/metadata/md5-cache/dev-qt/qtchooser-66-r2
@@ -3,12 +3,13 @@ DEPEND=test? ( dev-qt/qtcore:5 dev-qt/qttest:5 )
 DESCRIPTION=Tool to quickly switch between multiple Qt installations
 EAPI=8
 HOMEPAGE=https://code.qt.io/cgit/qtsdk/qtchooser.git/
+INHERIT=qmake-utils toolchain-funcs
 IUSE=test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=!<dev-qt/qtcore-5.15.3:5
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qt.io/official_releases/qtchooser/qtchooser-66.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=1510a5e9a5c192f3c9b1088a9f652529
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=fe9790fc315634377af7a8b82b8fff28
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
deleted file mode 100644
index 948b7702fe69..000000000000
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=a6b6fea40b4d12cffd15d18d714651f7
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.3
index cedcf7781409..cafc18f37cdf 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Multi-threading concurrence support library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=8dc3ee921ef7ca674330accb641e1906
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=8e807d96b7d1cadfc40bb625676bde12
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r14 b/metadata/md5-cache/dev-qt/qtcore-5.15.2-r14
deleted file mode 100644
index 8656e3a809e9..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.2-r14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare pretend setup test unpack
-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:= ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Cross-platform application development framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=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:= ) >=dev-qt/qtchooser-66-r1
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/f4ac0b55c37f2b594ffbe639db43dac365825c7c/qtbase-f4ac0b55c37f2b594ffbe639db43dac365825c7c.tar.gz -> qtbase-5.15.2-f4ac0b55.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f13dad68f0419fbe3d80344ef28541ab
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.3 b/metadata/md5-cache/dev-qt/qtcore-5.15.3
index 5601f0769f8c..da7f5b7c6f6d 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=icu old-kernel systemd debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=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:= )
 RESTRICT=test
 SLOT=5/5.15.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=69e6b3f14b98fc832e73aed8392e9d3b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	3cfb791b045bfb6773a6d0f2d80ce9fd	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=1c2177feaddca1cbe91d305df6ee73b2
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2-r1
deleted file mode 100644
index 9fce4e18bb48..000000000000
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] qml? ( =dev-qt/qtdeclarative-5.15.2*[gles2-only=] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=3D data visualization library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=gles2-only qml debug test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=GPL-3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] qml? ( =dev-qt/qtdeclarative-5.15.2*[gles2-only=] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdatavis3d-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=8fe6baee7361c9453de0282f14eff65f
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3
index 45066aa9b076..2cfeb09f0ed7 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[gles2-only=] qml? ( =dev-qt
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtdatavis3d-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=8fe6baee7361c9453de0282f14eff65f
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
deleted file mode 100644
index 82259e36c557..000000000000
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= >=sys-apps/dbus-1.4.20 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= >=sys-apps/dbus-1.4.20
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=959a0c4d2e7688413f8804a5071f425f
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.15.3 b/metadata/md5-cache/dev-qt/qtdbus-5.15.3
index c2d5ea696b4c..f45d7f1aabb4 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for inter-process communication over the D-Bus protocol
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= sys-apps/dbus
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d04959d051e1b3337222d92f4140fe07
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=03e9c004fdf6bffb2b0ea83030b64840
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r15 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r15
deleted file mode 100644
index 311000d39d19..000000000000
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.2-r15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.2* =dev-qt/qttest-5.15.2* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.2* ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=The QML and Quick modules for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.2* =dev-qt/qttest-5.15.2* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.2* ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtdeclarative/-/archive/29ee9a0e9f02ec74153a2cf09dc63722bc273544/qtdeclarative-29ee9a0e9f02ec74153a2cf09dc63722bc273544.tar.gz -> qtdeclarative-5.15.2-29ee9a0e.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=580e87cef7cd18283c562654633b8137
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.3-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.3-r1
index 895920699994..77e80ee8fb4e 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.15.3-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.15.3-r1
@@ -4,12 +4,13 @@ DEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*:5=[gles2-only=,vulkan=] =dev
 DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtdeclarative https://community.kde.org/Qt5PatchCollection
+INHERIT=python-any-r1 qt5-build
 IUSE=gles2-only +jit localstorage vulkan +widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*:5=[gles2-only=,vulkan=] =dev-qt/qtnetwork-5.15.3* =dev-qt/qttest-5.15.3* media-libs/libglvnd localstorage? ( =dev-qt/qtsql-5.15.3* ) widgets? ( =dev-qt/qtwidgets-5.15.3*[gles2-only=] )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtdeclarative-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtdeclarative-5.15.3-gentoo-kde-2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=32332197e822d9566c71b9a0c3d6220d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=9efb0dcc64562b87c762779b72861f3c
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
deleted file mode 100644
index f9ef2a9c72d5..000000000000
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5= network? ( =dev-qt/qtnetwork-5.15.2*[ssl] ) widgets? ( =dev-qt/qtwidgets-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Tool for reporting diagnostic information about Qt and its environment
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=+network +widgets debug test
-KEYWORDS=amd64 ~arm ~hppa ~ppc64 ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5= network? ( =dev-qt/qtnetwork-5.15.2*[ssl] ) widgets? ( =dev-qt/qtwidgets-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ae73e8ff155993ef454ca9977f9a9cab
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.15.3 b/metadata/md5-cache/dev-qt/qtdiag-5.15.3
index a096775ee81c..fe5a4e9e142a 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5= network? ( =dev-qt/qt
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=5dc8d7cd77ddcb1b6dde4bcae368413f
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
deleted file mode 100644
index a76689c5048e..000000000000
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.2* ) sdl? ( media-libs/libsdl2 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt module to support gamepad hardware
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=evdev qml sdl debug test
-KEYWORDS=amd64 ~arm arm64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[evdev?] evdev? ( virtual/libudev:= ) qml? ( =dev-qt/qtdeclarative-5.15.2* ) sdl? ( media-libs/libsdl2 )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgamepad-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=3337ce0039d22965fe2e75fbc95efb4a
diff --git a/metadata/md5-cache/dev-qt/qtgamepad-5.15.3 b/metadata/md5-cache/dev-qt/qtgamepad-5.15.3
index d910379b7ec5..66f55d084865 100644
--- a/metadata/md5-cache/dev-qt/qtgamepad-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtgamepad-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[evdev?] evdev? ( virtual/li
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtgamepad-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=708331686dae6f6fcf87086962c63b7d
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2-r1
deleted file mode 100644
index 464b0bffa074..000000000000
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Set of QML types for adding visual effects to user interfaces
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2*
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtgraphicaleffects-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ec002371a9d06b3aa92ff7f720806f5e
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.3
index 0770391e8f1b..4b561893d2b5 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Set of QML types for adding visual effects to user interfaces
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3*
 RESTRICT=!test? ( test ) test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtgraphicaleffects-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ab7082ecbb98ef90ace512e87fc3edbe
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=5edee4f93b05925603f2d6331a8dd468
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r16 b/metadata/md5-cache/dev-qt/qtgui-5.15.2-r16
deleted file mode 100644
index 8a87450d5943..000000000000
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.2-r16
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.2*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.2* ) 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-5.15.2* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.2* ) 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 ) evdev? ( sys-kernel/linux-headers ) linuxfb? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.2* )
-RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.2*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.2* ) 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-5.15.2* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.2* ) 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 )
-REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl ) ibus? ( dbus ) libinput? ( udev ) X? ( gles2-only? ( egl ) )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/f4ac0b55c37f2b594ffbe639db43dac365825c7c/qtbase-f4ac0b55c37f2b594ffbe639db43dac365825c7c.tar.gz -> qtbase-5.15.2-f4ac0b55.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ee3592ef88da3c38d343451c37b1bdb0
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.15.3 b/metadata/md5-cache/dev-qt/qtgui-5.15.3
index 6b662fd01771..ae90dc8b3a6c 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.15.3
@@ -5,7 +5,7 @@ DESCRIPTION=The GUI module and platform plugins for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput linuxfb +png tslib tuio +udev vnc vulkan wayland +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=ibus? ( app-i18n/ibus ) wayland? ( =dev-qt/qtwayland-5.15.3* )
 RDEPEND=dev-libs/glib:2 =dev-qt/qtcore-5.15.3*:5= dev-util/gtk-update-icon-cache media-libs/fontconfig media-libs/freetype:2 media-libs/harfbuzz:= sys-libs/zlib:= dbus? ( =dev-qt/qtdbus-5.15.3* ) 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-5.15.3* ) udev? ( virtual/libudev:= ) vnc? ( =dev-qt/qtnetwork-5.15.3* ) 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 )
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( eglfs linuxfb vnc X ) accessibility? ( dbus X ) eglfs? ( egl )
 RESTRICT=test
 SLOT=5/5.15.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=29daa7c05a40debed7b467ac44748f21
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=42914fccb60a062c62abd72cfbd40a24
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10 b/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
deleted file mode 100644
index b237ca27c87a..000000000000
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt5 module for integrating online documentation into applications
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtsql-5.15.2*[sqlite] =dev-qt/qtwidgets-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ee4691bf8e805e46abe9c6c13b72650c
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.15.3 b/metadata/md5-cache/dev-qt/qthelp-5.15.3
index 9f07b6f7e94f..9c5aaaac01d9 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.15.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for integrating online documentation into applications
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3* =dev-qt/qtsql-5.15.3*[sqlite] =dev-qt/qtwidgets-5.15.3*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=85c3f3a58354929ecc0e154dfb51e82b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=682208c65698bd40903999569d34b6eb
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
deleted file mode 100644
index 9fb0189f9c86..000000000000
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Additional format plugins for the Qt image I/O system
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=mng debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtimageformats/-/archive/cb82c74310837fe4e832c8ab72176a5d63e4355f/qtimageformats-cb82c74310837fe4e832c8ab72176a5d63e4355f.tar.gz -> qtimageformats-5.15.2-cb82c743.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=a02e026f6f824f94fbcbb290c5fb4e9e
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.3
index 7dabd3f2d657..50cac21ebed9 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Additional format plugins for the Qt image I/O system
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=mng debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3* media-libs/libwebp:= media-libs/tiff:0 mng? ( media-libs/libmng:= )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtimageformats-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c710cecb7b36e0f73a25662a248d7af8
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=9f51ba7798f6e59a5256f645f758465e
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
deleted file mode 100644
index 3e97e99df1a1..000000000000
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtpositioning-5.15.2*[qml] =dev-qt/qtsql-5.15.2* sys-libs/zlib =dev-qt/qtconcurrent-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Location (places, maps, navigation) library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtpositioning-5.15.2*[qml] =dev-qt/qtsql-5.15.2* sys-libs/zlib
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtlocation/-/archive/861e372b6ad81570d4f496e42fb25a6699b72f2f/qtlocation-861e372b6ad81570d4f496e42fb25a6699b72f2f.tar.gz -> qtlocation-5.15.2-861e372b.tar.gz https://invent.kde.org/qt/qt/qtlocation-mapboxgl/-/archive/d3101bbc22edd41c9036ea487d4a71eabd97823d/qtlocation-mapboxgl-d3101bbc22edd41c9036ea487d4a71eabd97823d.tar.gz -> qtlocation-mapboxgl-5.15.2-d3101bbc.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c7b0747e0033900c7a998f6900638ed4
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1 b/metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1
index 79c68e627656..01fa98be6e5c 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.3-r1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtlocation-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.3-gentoo-kde-2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=6a0240e858b42231b4aca00320d3705b
diff --git a/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024 b/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
index 3041f649e8c1..4de66feab993 100644
--- a/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
+++ b/metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5
 DESCRIPTION=QFile extension with advisory locking functions
 EAPI=8
 HOMEPAGE=https://code.qt.io/cgit/qt-solutions/qt-solutions.git/
+INHERIT=qmake-utils
 IUSE=doc
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-qt/qtcore:5
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qt-solutions-20171024.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=6bce0b9535027846261a5a365388c421
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
deleted file mode 100644
index 1dc78be0a3e7..000000000000
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtnetwork-5.15.2* 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-5.15.2* gles2-only? ( =dev-qt/qtgui-5.15.2*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] media-libs/libglvnd ) gstreamer? ( x11-base/xorg-proto ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtnetwork-5.15.2* 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-5.15.2* gles2-only? ( =dev-qt/qtgui-5.15.2*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.2*[gles2-only=] media-libs/libglvnd )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtmultimedia-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c398e083e956775609b9594c78c99974
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.3
index ad8bd8e8625e..daa695e98337 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia (audio, video, radio, camera) library for the Qt5 framewo
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa gles2-only gstreamer openal pulseaudio qml widgets debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[gles2-only=] =dev-qt/qtnetwork-5.15.3* 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-5.15.3* gles2-only? ( =dev-qt/qtgui-5.15.3*[egl] ) openal? ( media-libs/openal ) ) widgets? ( =dev-qt/qtwidgets-5.15.3*[gles2-only=] media-libs/libglvnd )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtmultimedia-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=93ad6a7c2c8aa85f0cb223b97f9d8884
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=62822f951e9f08bf41f628e7af0c41ae
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
deleted file mode 100644
index 2b7752f7fbf9..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.2* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.2* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=bindist connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.2* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.2* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0=[bindist(-)=] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=223d0c22b6ed0dca829fbb88c627f69f
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r14 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r14
deleted file mode 100644
index 11cbf1e40243..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.2-r14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare setup test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.2* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.2* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Network abstraction library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.2* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.2* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/f4ac0b55c37f2b594ffbe639db43dac365825c7c/qtbase-f4ac0b55c37f2b594ffbe639db43dac365825c7c.tar.gz -> qtbase-5.15.2-f4ac0b55.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d88e865a41e6201bd4d4a29308f00870
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.15.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.15.3
index 36aca6b6352a..87ce05e12bda 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Network abstraction library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=connman gssapi libproxy networkmanager sctp +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= sys-libs/zlib:= connman? ( =dev-qt/qtdbus-5.15.3* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) networkmanager? ( =dev-qt/qtdbus-5.15.3* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f9a2554cebbba2d8b64c8f960940535c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=d6d1d02ba9200184a5dd9212724eb118
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2-r1
deleted file mode 100644
index ee7d034354d2..000000000000
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Network authorization library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=GPL-3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtnetworkauth-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=333f921a581ff9c9a4d938debbc0f872
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3
index 19dec3347dd6..bbccbda54ae3 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtnetwork-5.15.3*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtnetworkauth-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=8771aaac50cee9441b703383f6c402fa
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
deleted file mode 100644
index 73b4c1c4d2a2..000000000000
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=] test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=]
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2918953fbc85a3a23d022499e40d3f15
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.15.3 b/metadata/md5-cache/dev-qt/qtopengl-5.15.3
index 0ce46ca51746..20a19d9644fb 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=OpenGL support library for the Qt5 framework (deprecated)
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*[gles2-only=] =dev-qt/qtwidgets-5.15.3*[gles2-only=]
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2e5866d4eb55cecd5a0fc86a73aa169d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=ffbc8505c16dc4b5a67e12fd40e18a9f
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
deleted file mode 100644
index 4dcf1500c8ef..000000000000
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Command line client to QStandardPaths
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=63b22cf29ef127fec87548dbf9b8285a
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.15.3 b/metadata/md5-cache/dev-qt/qtpaths-5.15.3
index db7ba4b98859..2e0a6d6f40b2 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Command line client to QStandardPaths
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttools https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=287da5976ff63b0b78ab9ffa3dffc27b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=91568130c2310a9e68a944bbe7d46232
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r10
deleted file mode 100644
index a11535ff59e0..000000000000
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt5 plugin metadata dumper
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttools/-/archive/33693a928986006d79c1ee743733cde5966ac402/qttools-33693a928986006d79c1ee743733cde5966ac402.tar.gz -> qttools-5.15.2-33693a92.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fc455d123f307930dc8b4fc0788264d1
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.3 b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.3
index 9bd2a4c5a008..77d2308b18b5 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttools-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttools-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=15ea4945b61a07b598a29f06a3f6f8f9
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.2-r1
deleted file mode 100644
index 65767e401c7f..000000000000
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND==dev-qt/qtcore-5.15.2* geoclue? ( =dev-qt/qtdbus-5.15.2* ) qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Physical position determination library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=geoclue +qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
-RDEPEND==dev-qt/qtcore-5.15.2* geoclue? ( =dev-qt/qtdbus-5.15.2* ) qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtlocation-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=42fafdb025e9893154d0e0b8a6e3658a
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.15.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.15.3
index cf9e50138f13..d201c6321c5a 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.15.3
@@ -5,12 +5,12 @@ DESCRIPTION=Physical position determination library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=geoclue +qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 PDEPEND=geoclue? ( app-misc/geoclue:2.0 )
 RDEPEND==dev-qt/qtcore-5.15.3* geoclue? ( =dev-qt/qtdbus-5.15.3* ) qml? ( =dev-qt/qtdeclarative-5.15.3* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtlocation-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=89e2e8cf069a2268ab4ea483bdd65bb5
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=9ee9be930836006f7320811d018dd775
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r11
deleted file mode 100644
index f131a2546e33..000000000000
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=] cups? ( >=net-print/cups-1.4 ) test? ( =dev-qt/qtnetwork-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Printing support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*[gles2-only=] =dev-qt/qtwidgets-5.15.2*[gles2-only=] cups? ( >=net-print/cups-1.4 )
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/f4ac0b55c37f2b594ffbe639db43dac365825c7c/qtbase-f4ac0b55c37f2b594ffbe639db43dac365825c7c.tar.gz -> qtbase-5.15.2-f4ac0b55.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=589f53162b77fa4f0a173904bb7bf5b8
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.3
index a32711e790c2..9a1972a366fa 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Printing support library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=cups gles2-only test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*[gles2-only=] =dev-qt/qtwidgets-5.15.3*[gles2-only=] cups? ( net-print/cups )
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ccd5538912c2b96a157a7a89e760b46d
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=91d82cbd5bc2ff42ec33a025add9e03a
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2-r1
deleted file mode 100644
index f297a9621812..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* widgets? ( =dev-qt/qtwidgets-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (deprecated)
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=+widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* widgets? ( =dev-qt/qtwidgets-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquickcontrols-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=e7bf45a462f1996420a843da656cae7c
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.3
index 988e9b7d3ddf..8c3b6edd6af9 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Set of Qt Quick controls to create complete user interfaces (depreca
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=+widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.3* widgets? ( =dev-qt/qtwidgets-5.15.3* )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtquickcontrols-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=482324a50886807c9ced2a6552f9a707
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=40056e230ea3acea3e621dd827bd9888
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r13 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r13
deleted file mode 100644
index bc6a082a3b17..000000000000
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.2-r13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* widgets? ( =dev-qt/qtwidgets-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Set of next generation Qt Quick controls for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* widgets? ( =dev-qt/qtwidgets-5.15.2* ) =dev-qt/qtgraphicaleffects-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtquickcontrols2/-/archive/d8d6b14b9907adbc6ce307d52be34aaa761a58fa/qtquickcontrols2-d8d6b14b9907adbc6ce307d52be34aaa761a58fa.tar.gz -> qtquickcontrols2-5.15.2-d8d6b14b.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=b680d0fef87f63516947d44c00b5e0d5
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3
index 29278a6018f8..42ded2d3bbd8 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtquickcontrols2-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtquickcontrols2-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=473c84fc7df9080d42ac559a76ce87ad
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2-r1
deleted file mode 100644
index 45170746dfcc..000000000000
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt module for keyframe-based timeline construction
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtquicktimeline-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=71073ce8956254f3cd8bf636553960e9
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3
index 4d89a87a00c9..ac3245214a28 100644
--- a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3*
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtquicktimeline-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=917a488ca9982790149bb74991a7f536
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtscript-5.15.2-r1
deleted file mode 100644
index 250d1d7eadec..000000000000
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* scripttools? ( =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=+jit scripttools debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* scripttools? ( =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscript-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=9d234e100e1c3bf7259d8ce13eaa3bd6
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.15.3 b/metadata/md5-cache/dev-qt/qtscript-5.15.3
index a5bfd973f29f..f6cb3c1fb315 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Application scripting library for the Qt5 framework (deprecated)
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=+jit scripttools debug test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* scripttools? ( =dev-qt/qtgui-5.15.3* =dev-qt/qtwidgets-5.15.3* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtscript-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=02704831dcd93e1dc708e696b2af608c
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=11a8422117bb84f40f78396b0fb3e964
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtscxml-5.15.2-r1
deleted file mode 100644
index 13425be0c472..000000000000
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=State Chart XML (SCXML) support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtscxml-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=75f5b6fd13850b4678a1b605cf2d8f6c
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.15.3 b/metadata/md5-cache/dev-qt/qtscxml-5.15.3
index b003029baf5b..42503ab8bc7f 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3*
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtscxml-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=75f5b6fd13850b4678a1b605cf2d8f6c
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtsensors-5.15.2-r1
deleted file mode 100644
index 8d570bbdf6e9..000000000000
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Hardware sensor access library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdbus-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtsensors-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=383ddc2c70ca9022e359fd38fa424ed8
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.15.3 b/metadata/md5-cache/dev-qt/qtsensors-5.15.3
index d7e5558228bd..e611839bb97c 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Hardware sensor access library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdbus-5.15.3* qml? ( =dev-qt/qtdeclarative-5.15.3* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtsensors-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=e5487fcbcd79b014e0d9f1bf37ee26f3
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=233d0f863efd740593dfe06db1083dab
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.2-r1
deleted file mode 100644
index bea5c4ecf0ba..000000000000
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtserialport-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt module to access CAN, ModBus, and other industrial serial buses and protocols
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtserialport-5.15.2*
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialbus-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=9a8aeaf699fe3388522283fe5b702d4b
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.15.3 b/metadata/md5-cache/dev-qt/qtserialbus-5.15.3
index e508eb65b36a..f77c00035a4f 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtnetwork-5.15.3* =dev-qt/qtserialport-5.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtserialbus-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=515d52c2dcfc3307b0a866e9ebd3aeb7
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtserialport-5.15.2-r1
deleted file mode 100644
index 875e9106085a..000000000000
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* virtual/libudev:= test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Serial port abstraction library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* virtual/libudev:=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtserialport-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2328001694afb21002e0aead8992643b
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.15.3 b/metadata/md5-cache/dev-qt/qtserialport-5.15.3
index 44d5c399295e..f2f4cc432552 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Serial port abstraction library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* virtual/libudev:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtserialport-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=e7dc22311cbe05e6962b088e03758801
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=a06e965080b9cff31fc641a020060b1a
diff --git a/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024 b/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024
index 50963858752b..b78c30bdab6f 100644
--- a/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024
+++ b/metadata/md5-cache/dev-qt/qtsingleapplication-2.6.1_p20171024
@@ -3,11 +3,12 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtnetwork:5 X? ( dev-q
 DESCRIPTION=Qt library to start applications only once per user
 EAPI=8
 HOMEPAGE=https://code.qt.io/cgit/qt-solutions/qt-solutions.git/
+INHERIT=qmake-utils
 IUSE=doc X
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=|| ( LGPL-2.1 GPL-3 )
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtlockedfile[qt5(+)] dev-qt/qtnetwork:5 X? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pesa/distfiles/qt-solutions-20171024.tar.xz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=9d693aee6cc1adf76b642beb8fca1e5b
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r2
deleted file mode 100644
index 9e872c3998d6..000000000000
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.2* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.2*[alsa?] alsa? ( media-libs/alsa-lib ) ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Text-to-speech library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=alsa flite debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.2* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.2*[alsa?] alsa? ( media-libs/alsa-lib ) )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtspeech/-/archive/16c625528f5e34e698983fc66a7c9cfb96da8052/qtspeech-16c625528f5e34e698983fc66a7c9cfb96da8052.tar.gz -> qtspeech-5.15.2-16c62552.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=bb15f00b3517046f189d29ff2a3bc4b3
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.3 b/metadata/md5-cache/dev-qt/qtspeech-5.15.3
index 43122eb50ffe..7306b7f4e299 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.3
@@ -11,5 +11,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.3* flite
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtspeech-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=fface3820df5be546fa22158e013273a
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtsql-5.15.2-r11
deleted file mode 100644
index 4d078940d92a..000000000000
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.2-r11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*: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 ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=SQL abstraction library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*: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 )
-REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/f4ac0b55c37f2b594ffbe639db43dac365825c7c/qtbase-f4ac0b55c37f2b594ffbe639db43dac365825c7c.tar.gz -> qtbase-5.15.2-f4ac0b55.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=56b8f899ae222bd03c2a6196b0f39910
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.15.3 b/metadata/md5-cache/dev-qt/qtsql-5.15.3
index 427868a06715..e6c73c105400 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.15.3
@@ -5,12 +5,12 @@ DESCRIPTION=SQL abstraction library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=freetds mysql oci8 odbc postgres +sqlite debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*: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 )
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.15.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=47313050d3fcdbcae25cf6915b92bdfc
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=237e9e2e0a5d3aa8624443e00737c700
diff --git a/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1 b/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
index b9d2a7bc2961..b661a7bf7fed 100644
--- a/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
+++ b/metadata/md5-cache/dev-qt/qtstyleplugins-5.0.0_p20170311-r1
@@ -3,10 +3,11 @@ DEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5= x11-libs/gtk+:
 DESCRIPTION=Additional style plugins for Qt5 (gtk2, cleanlook, plastic, motif)
 EAPI=7
 HOMEPAGE=https://code.qt.io/cgit/qt/qtstyleplugins.git/
+INHERIT=qmake-utils
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5= dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5= x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 SLOT=5
 SRC_URI=https://github.com/qt/qtstyleplugins/archive/335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz -> qtstyleplugins-5.0.0_p20170311.tar.gz
-_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	f5eb2f69fffe94292aaaf802fb21c8d1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_eclasses_=multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
 _md5_=a447e0b62209ead0edc6597a03783d99
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r13 b/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r13
deleted file mode 100644
index 9cd56f8acce6..000000000000
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.2-r13
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* sys-libs/zlib:= test? ( =dev-qt/qtxml-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=SVG rendering library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwidgets-5.15.2* sys-libs/zlib:=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtsvg/-/archive/728012f7762ecd5762d493f8796907c6456f31e7/qtsvg-728012f7762ecd5762d493f8796907c6456f31e7.tar.gz -> qtsvg-5.15.2-728012f7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fdb190ad71950fc5c289bad7c94fd91e
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.15.3 b/metadata/md5-cache/dev-qt/qtsvg-5.15.3
index c8fd333c0b68..67705a5db1ce 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=SVG rendering library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtsvg https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3* =dev-qt/qtwidgets-5.15.3* sys-libs/zlib:=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtsvg-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.3-gentoo-kde-1.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtsvg-5.15.3-QTBUG-90744.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=9643363072f44ddcace84a142df67261
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=a9aa03d0c91c017ae6614717ad5609ab
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.2-r10 b/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
deleted file mode 100644
index 7e4580665614..000000000000
--- a/metadata/md5-cache/dev-qt/qttest-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= test? ( =dev-qt/qtgui-5.15.2* =dev-qt/qtxml-5.15.2* )
-DESCRIPTION=Unit testing library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5=
-RESTRICT=!test? ( test ) test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=009a9b960df1c8261493a788bc904f8e
diff --git a/metadata/md5-cache/dev-qt/qttest-5.15.3 b/metadata/md5-cache/dev-qt/qttest-5.15.3
index d7e847ca3d22..c40bbbd8d386 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.15.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Unit testing library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=test debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5=
 RESTRICT=!test? ( test ) test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=54590038a4afc6cfaf215c3a1a6ecbee
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=c88a7bed9df6987dfd22cf6d50d0fadc
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10 b/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
deleted file mode 100644
index f3008d5d75ed..000000000000
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.2-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND==dev-qt/linguist-tools-5.15.2* dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Translation files for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qttranslations/-/archive/68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f/qttranslations-68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f.tar.gz -> qttranslations-5.15.2-68f420eb.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=bf28f87c3b8258fdd838e74cbfdbff07
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.15.3 b/metadata/md5-cache/dev-qt/qttranslations-5.15.3
index a1ccc0b95417..e5a6c527359e 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.15.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.15.3
@@ -5,10 +5,10 @@ DESCRIPTION=Translation files for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qttranslations https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qttranslations-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qttranslations-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2c4c295e94858c5bd0006048e4e123e6
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=11280b58edf22c58e4cac0acc3659404
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r12 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r12
deleted file mode 100644
index 0d3fbe234d1e..000000000000
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.2-r12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtsvg-5.15.2* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Customizable input framework and virtual keyboard for Qt
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=handwriting +spell +X debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtsvg-5.15.2* spell? ( app-text/hunspell:= ) X? ( x11-libs/libxcb:= )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtvirtualkeyboard/-/archive/98d1fd864cbb6c7c012c4139118808af110fb8f0/qtvirtualkeyboard-98d1fd864cbb6c7c012c4139118808af110fb8f0.tar.gz -> qtvirtualkeyboard-5.15.2-98d1fd86.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ba69f9b9ba42b2f3abd1d00a9d1bc67b
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3
index ca6a5b6acabe..530381357f3c 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtvirtualkeyboard-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtvirtualkeyboard-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=f9c8d69778c6ebdddc3b3f82b2805335
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r17 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r17
deleted file mode 100644
index 46f0b23320c3..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r17
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=vulkan X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://invent.kde.org/qt/qt/qtwayland/-/archive/867540b9d913760a847ff67c8694d817c821f2c2/qtwayland-867540b9d913760a847ff67c8694d817c821f2c2.tar.gz -> qtwayland-5.15.2-867540b9.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ab0175de14016289a3585b661dbf0638
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r20 b/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r20
deleted file mode 100644
index ed6a76d8a88e..000000000000
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.2-r20
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Wayland platform plugin for Qt
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=vulkan X debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.2*:5= =dev-qt/qtdeclarative-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.2*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
-RESTRICT=test
-SLOT=5/5.15.2
-SRC_URI=https://invent.kde.org/qt/qt/qtwayland/-/archive/d6a6b727832819d118199f7016c2c401663ee370/qtwayland-d6a6b727832819d118199f7016c2c401663ee370.tar.gz -> qtwayland-5.15.2-d6a6b727.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=11dc86023484a0f6c915f88345a2c899
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1 b/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1
index 07a4bf47a6c6..2b6504cd4939 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.15.3-r1
@@ -4,12 +4,13 @@ DEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.3*:5= =dev-qt/qtdeclarative-5.15.3*:
 DESCRIPTION=Wayland platform plugin for Qt
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwayland https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
 IUSE=vulkan X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/wayland =dev-qt/qtcore-5.15.3*:5= =dev-qt/qtdeclarative-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5=[egl,libinput,vulkan=,X?] media-libs/libglvnd vulkan? ( dev-util/vulkan-headers ) X? ( =dev-qt/qtgui-5.15.3*[-gles2-only] x11-libs/libX11 x11-libs/libXcomposite )
 RESTRICT=test
 SLOT=5/5.15.3
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtwayland-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwayland-5.15.3-gentoo-kde-2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=f9f334a748a6783d0089cf66941a84fd
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=164e2ebe3900d604a4070c9f9abccf68
diff --git a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.3 b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.3
index 5a710ddd72f3..8529a5bcf8d9 100644
--- a/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Tool that generates certain boilerplate C++ code from Wayland protoc
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= !<dev-qt/qtwayland-5.15.3:5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtwayland-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d793b73e23a5b5cb697ee90088bed296
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=0ebcd98433b0aaae3827a2b03b8df813
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2-r10
deleted file mode 100644
index 024a62c5e6a5..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtwebchannel/-/archive/fa8b07105b5e274daaa8adcc129fa4aa0447f9f7/qtwebchannel-fa8b07105b5e274daaa8adcc129fa4aa0447f9f7.tar.gz -> qtwebchannel-5.15.2-fa8b0710.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=36610cc927bfb8f5e0c7e0c2b10c638c
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.3
index dfdb18666472..0eaef942195a 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Qt5 module for integrating C++ and QML applications with HTML/JavaSc
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebchannel https://community.kde.org/Qt5PatchCollection
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* qml? ( =dev-qt/qtdeclarative-5.15.3* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtwebchannel-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebchannel-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d6bf9168ed3c4ecf531fe773827cc636
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=a1682c8841b4efc4cb9aedbe89e539ba
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211216 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211216
deleted file mode 100644
index 56b24ebc5b0e..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.2_p20211216
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) 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 ) dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=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-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwebchannel-5.15.2*[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-5.15.2* ) geolocation? ( =dev-qt/qtpositioning-5.15.2* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.2*[widgets] =dev-qt/qtwidgets-5.15.2* ) media-libs/libglvnd test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-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-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtnetwork-5.15.2* =dev-qt/qtprintsupport-5.15.2* =dev-qt/qtwebchannel-5.15.2*[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-5.15.2* ) geolocation? ( =dev-qt/qtpositioning-5.15.2* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.2*[widgets] =dev-qt/qtwidgets-5.15.2* )
-REQUIRED_USE=designer? ( widgets )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.2_p20211216.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=ed33650d1ba99db8a919b4feae81a314
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406
index ca5599ead08d..f4498a744991 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.3_p20220406
@@ -4,6 +4,7 @@ DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/exp
 DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
 EAPI=8
 HOMEPAGE=https://www.qt.io/
+INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
 IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets debug test
 KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
@@ -12,5 +13,5 @@ REQUIRED_USE=designer? ( widgets )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220406.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220406-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
-_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	59dddabd6a41ab69723654916142f63b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=92e9464932e4619ba1919ea427b01ea8
+_eclasses_=check-reqs	82234bf011d5453330773cd5fc3f0199	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=6ad042bd93bd210b29f7bf537ea6fe53
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r11 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r11
deleted file mode 100644
index b37e194981b4..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.2-r11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=qml +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtwebsockets/-/archive/b13b56904b76e96ea52d0efe56395acc94b17d96/qtwebsockets-b13b56904b76e96ea52d0efe56395acc94b17d96.tar.gz -> qtwebsockets-5.15.2-b13b5690.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=9e51f7118e12a6c52ff8cc73c33eb122
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.3
index dd975bc9c8cb..d471226cda28 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of the WebSocket protocol for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtwebsockets https://community.kde.org/Qt5PatchCollection
 IUSE=qml +ssl debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtnetwork-5.15.3*[ssl=] qml? ( =dev-qt/qtdeclarative-5.15.3* )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtwebsockets-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtwebsockets-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=9895e156e8f8d8bbb892c9fb236d77fe
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=e21017517c443ee098fced80e339b255
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2 b/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
deleted file mode 100644
index 76fa78b23d59..000000000000
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwebengine-5.15.2*:5 test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Module for displaying web content in a QML application using the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtdeclarative-5.15.2* =dev-qt/qtgui-5.15.2* =dev-qt/qtwebengine-5.15.2*:5
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtwebview-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d424e8bfdcf97751a66a64b449c3ea1a
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.15.3 b/metadata/md5-cache/dev-qt/qtwebview-5.15.3
index cd543a88a102..4a51ee982293 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.15.3
@@ -11,5 +11,5 @@ RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtdeclarative-5.15.3* =dev-qt/qtgui-5.15.
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtwebview-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
 _md5_=adca26c0fc80c864c3303bc2133c3a3a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r12 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r12
deleted file mode 100644
index abefa64fbe0c..000000000000
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.2-r12
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.2* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.2*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5= =dev-qt/qtgui-5.15.2*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.2* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.2*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
-REQUIRED_USE=gtk? ( dbus )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/f4ac0b55c37f2b594ffbe639db43dac365825c7c/qtbase-f4ac0b55c37f2b594ffbe639db43dac365825c7c.tar.gz -> qtbase-5.15.2-f4ac0b55.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=1012cd0cba6014424097392d5a6d10e0
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.3
index 1468bc5531ba..325ebba76f48 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.3
@@ -5,12 +5,12 @@ DESCRIPTION=Set of components for creating classic desktop-style UIs for the Qt5
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=dbus gles2-only gtk +png +X debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5= =dev-qt/qtgui-5.15.3*:5=[gles2-only=,png=,X?] dbus? ( =dev-qt/qtdbus-5.15.3* ) gtk? ( dev-libs/glib:2 =dev-qt/qtgui-5.15.3*:5=[dbus] x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango )
 REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c6ef7e010cf285b6e17d9cbbeeaf2afa
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=24f688f064bf2d6594c3a8fee160135a
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.2-r1
deleted file mode 100644
index b4e095a3f415..000000000000
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[X] test? ( =dev-qt/qtwidgets-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtgui-5.15.2*[X]
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtx11extras-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=6f93bce74a0be4aa9e7c381f28dcbdc2
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.15.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.15.3
index 2c297cb2f80b..5f2f12d055a7 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Linux/X11-specific support library for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtgui-5.15.3*[X]
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtx11extras-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7dade1cd30192646dec5e43ca1e5cbab
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=523fdf1cf6fe040f3e9b6071a637f178
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10 b/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
deleted file mode 100644
index e28a6f5894cd..000000000000
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.2-r10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install nofetch postinst postrm prepare test unpack
-DEPEND==dev-qt/qtcore-5.15.2*:5= test? ( =dev-qt/qtnetwork-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://community.kde.org/Qt5PatchCollection https://invent.kde.org/qt/qt/ https://www.qt.io/
-IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2*:5=
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://invent.kde.org/qt/qt/qtbase/-/archive/a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd/qtbase-a4f9e56975fa6ab4a1f63a9b34a4d77b1cfe4acd.tar.gz -> qtbase-5.15.2-a4f9e569.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	4f2cef3496909640f9114c853d2077b4	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=06bbe33052261db7a51b12d00bb4766a
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.15.3 b/metadata/md5-cache/dev-qt/qtxml-5.15.3
index 7b33f54bf966..15da1a719337 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=Implementation of SAX and DOM for the Qt5 framework
 EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3*:5=
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtbase-everywhere-opensource-src-5.15.3.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.3-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=690c557b95c11b0dcb49275774aba4ca
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=9933779bae90caeea1ac8e58c8d2be6d
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1
deleted file mode 100644
index 59ffb0c31767..000000000000
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* ) test? ( =dev-qt/qttest-5.15.2* )
-DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/
-IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND==dev-qt/qtcore-5.15.2* =dev-qt/qtnetwork-5.15.2* qml? ( =dev-qt/qtdeclarative-5.15.2* )
-RESTRICT=test
-SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtxmlpatterns-everywhere-src-5.15.2.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=825633af44cfe12a95429aa15a892e0d
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.3
index b99459e26bb0..127aad47410f 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.3
@@ -5,11 +5,11 @@ DESCRIPTION=XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 f
 EAPI=8
 HOMEPAGE=https://www.qt.io/
 IUSE=qml debug test
-KEYWORDS=amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND==dev-qt/qtcore-5.15.3* =dev-qt/qtnetwork-5.15.3* qml? ( =dev-qt/qtdeclarative-5.15.3* ) !<dev-qt/qtchooser-66-r2
 RESTRICT=test
 SLOT=5
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.3/submodules/qtxmlpatterns-everywhere-opensource-src-5.15.3.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	8f05dc278c2f4587e3b92316ffc324cd	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=101ef4f0f98fbf3087d9364f89e27306
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4a33c9008e5ee30cb8840a3fdc24df2b	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=4c289180757d9a77baed29ab776ab012
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 /metadata/md5-cache/dev-qt
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)