gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /dev-qt
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
184 files changed, 920 insertions, 3581 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 9d9fee5b64f9..bb9b3e1419a8 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 6e40de2e5d57..e427b97b1440 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD assistant-5.14.2.ebuild 1199 BLAKE2B 5e506336db5b729fba83f3795e4130d60c05c6640fdbecd320fa417381b49a895db7118a87d72ff4bf65b75240057becbde8e33a31aebdc38fb5cbfc0d04eff7 SHA512 b16862c3efb6e5fe76b2d0839ccd0d5543fb4b5ec942a4e9479c2bd68d2edd11950f02c66ec7ee7256d392b97ac644a1d59210cc1986f9b8a528330d23e05f26
-EBUILD assistant-5.15.1.ebuild 1203 BLAKE2B 8c84ebd6164443a25ff706c24e36e609262a7778b01c1dc5be93b9f6c8dbb8e8193993db80121ab532bf551c129862c616fe986864511700f1d03ca632bce9ef SHA512 00d14550fe6431976d698245ba46e9beedaf72bf54dc876c13a90a750d508f52a375e312c024fa2a062b1aa0eebd9a55cd10fa776dc33ce667acff3bdec3fada
+EBUILD assistant-5.15.1.ebuild 1199 BLAKE2B 5e506336db5b729fba83f3795e4130d60c05c6640fdbecd320fa417381b49a895db7118a87d72ff4bf65b75240057becbde8e33a31aebdc38fb5cbfc0d04eff7 SHA512 b16862c3efb6e5fe76b2d0839ccd0d5543fb4b5ec942a4e9479c2bd68d2edd11950f02c66ec7ee7256d392b97ac644a1d59210cc1986f9b8a528330d23e05f26
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.14.2.ebuild b/dev-qt/assistant/assistant-5.14.2.ebuild
deleted file mode 100644
index fca5047fefa6..000000000000
--- a/dev-qt/assistant/assistant-5.14.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qthelp-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/assistant
-)
-
-src_prepare() {
-	qt_use_disable_mod webkit webkitwidgets \
-		src/assistant/assistant/assistant.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/assistant/assistant/images/assistant.png
-	newicon -s 128 src/assistant/assistant/images/assistant-128.png assistant.png
-	make_desktop_entry "${QT5_BINDIR}"/assistant 'Qt 5 Assistant' assistant 'Qt;Development;Documentation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/assistant/assistant-5.15.1.ebuild b/dev-qt/assistant/assistant-5.15.1.ebuild
index 7f0b3ec1e822..fca5047fefa6 100644
--- a/dev-qt/assistant/assistant-5.15.1.ebuild
+++ b/dev-qt/assistant/assistant-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 275c841d23db..a5e9c2ea6de2 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD designer-5.14.2.ebuild 1247 BLAKE2B 12e20acddd2b74ddcfa1997abacf4e5ede609ef3f560ac3bdb66d259157f6aa0abd4ac396cff8353077366e94c3cbc8e82df058ac3bda6fe64eadd6cfbe79c4c SHA512 79ca21a87996b9141f6eeac2702a96341d8be3651a7a31cb4053d2a4f9e55ddb58895e081d2f7a2636cb65cb218356634e034410de614e927cf8836c9524e684
-EBUILD designer-5.15.1.ebuild 1215 BLAKE2B 179ac93c9f2ce863e36611fad62ab67ffde360528f6954bc7fe16de967ff09a1a656a54986f1a811612226f45857fb831b70df54956c75d1a202cedac9a7a6c1 SHA512 ef677f7c0a3f4e4926518b0fae7ebf39d7d3fba25da9c033ab5e1e89b8fe9bb3173e18609afa83c8dd4c7f22437803f2583c2021bfe82ba1293d7c54aac6a481
+EBUILD designer-5.15.1.ebuild 1209 BLAKE2B 3fd4e04438f649271420eca585c05ce23365ca6f1b4fbfbd9c8bfe41d37597ee46a575817ee48ef9c8a6b1b8fcf3b869cdb0e4a82092b8dd88560cdca8c11e23 SHA512 a224a83a6564e9770b912c0371371975202c3e291e3343bac153b00746c98ab2121b11f5e55f6f2d38bd6b6e0fa3cccd08b62447076e7ffddd53d85722fa14d1
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.14.2.ebuild b/dev-qt/designer/designer-5.14.2.ebuild
deleted file mode 100644
index 29ac650d0892..000000000000
--- a/dev-qt/designer/designer-5.14.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-	declarative? ( ~dev-qt/qtdeclarative-${PV}[widgets] )
-	webkit? ( >=dev-qt/qtwebkit-5.9.1:5 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/designer
-)
-
-src_prepare() {
-	qt_use_disable_mod declarative quickwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt_use_disable_mod webkit webkitwidgets \
-		src/designer/src/plugins/plugins.pro
-
-	qt5-build_src_prepare
-}
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 128 src/designer/src/designer/images/designer.png
-	make_desktop_entry "${QT5_BINDIR}"/designer 'Qt 5 Designer' designer 'Qt;Development;GUIDesigner'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/designer/designer-5.15.1.ebuild b/dev-qt/designer/designer-5.15.1.ebuild
index bd0d954631d3..1f61eb738c6e 100644
--- a/dev-qt/designer/designer-5.15.1.ebuild
+++ b/dev-qt/designer/designer-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="WYSIWYG tool for designing and building graphical user interfaces with QtWidgets"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 381ac58f1a83..fc05b2e26127 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD linguist-tools-5.14.2.ebuild 682 BLAKE2B bfe79eac879018faef52283dfe413f5855d91b0e4f7185eb1fcbdb4a3c855c799b38631ca8a4ebadf0b3278efd1a7b78abe034dc120b8c1fd54b5b3ab5aab7ad SHA512 35891619bc9b7db15599a980b20bebbbb69b8aa12e06668fb945f9fa4cdefbccca0988459c56d967f2ce3e0d010218f9871f426db10bd06094b7db9d7a2b62c3
-EBUILD linguist-tools-5.15.1.ebuild 1001 BLAKE2B a8bdb3f3e76441a511839a7b38dd0d9d643b190fe797bbbc2828c3ef828d2e44395df2e60e1068c20bdb0e166e2e91ba98567f6a750945a9dcc8b0695abc1c34 SHA512 7b40c6159e2bd4ee75e088d83db20b369473fcb6518d2c149a81702af04c95667a7ac84b67814f144c082b26d69408dc7ddd22a0263f4a7fb6b75c7e47ae992d
+EBUILD linguist-tools-5.15.1.ebuild 995 BLAKE2B bad4b732720b1f36df9603532605c73bdefd65248376d5151c1bef2571512a2f3722b95d806f378f82b29b5bac5a2688a2498d5c9aff6e5981c3868635071a76 SHA512 743934f88f37d3e0f7beed91eed7050de9bd82678c1cf497713d409c3881f3b1edcdcae71706488675858ffb4b0772a94b6751bb8463f42d6c8022ba8d8a1afe
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
deleted file mode 100644
index ea280072e0e6..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tools for working with Qt translation data files"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtxml-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist
-)
-
-src_prepare() {
-	sed -i -e '/SUBDIRS += linguist/d' \
-		src/linguist/linguist.pro || die
-
-	qt_use_disable_mod qml qmldevtools-private \
-		src/linguist/lupdate/lupdate.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild
index 1f62623c5d30..c12bc99adfdd 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tools for working with Qt translation data files"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 879ebaf3288f..8c85db7bf668 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD linguist-5.14.2.ebuild 977 BLAKE2B 973508eefdaabe38b4a3ac066436e131fb3a05e612ceb7c9e3fcd0f19a00fb98dce1834c8bae6a674ff792553c9fe7b0b5f953398933c2a5470d6d42d51bc43f SHA512 a22f07d151d81202bd051c5d5ef78aacf36b290a1ebc7571833f5cfe9c4d61434bf857268c7667df7c91571fe8dbb6da71aeb0066aafd04eaac964c3f1e7a520
-EBUILD linguist-5.15.1.ebuild 981 BLAKE2B 94b33f5585f2d4f309149010e43ab5b0337a5592dee6e9a76caac22c1959bf35aadb53895711afa4460632dbb8f840dc362845395c6228398361976bbbc8a333 SHA512 d293abb17f6a3a68359474f9ff585c3e8ceb8fda2ea2d0792c7767b22ccb3bf043641f17d29b9d69dcf647c09976d2dba5965730d873cd7e13a0518b8f85b430
+EBUILD linguist-5.15.1.ebuild 977 BLAKE2B 973508eefdaabe38b4a3ac066436e131fb3a05e612ceb7c9e3fcd0f19a00fb98dce1834c8bae6a674ff792553c9fe7b0b5f953398933c2a5470d6d42d51bc43f SHA512 a22f07d151d81202bd051c5d5ef78aacf36b290a1ebc7571833f5cfe9c4d61434bf857268c7667df7c91571fe8dbb6da71aeb0066aafd04eaac964c3f1e7a520
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.14.2.ebuild b/dev-qt/linguist/linguist-5.14.2.ebuild
deleted file mode 100644
index b1887a6ebd67..000000000000
--- a/dev-qt/linguist/linguist-5.14.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool for translating Qt applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/linguist/linguist
-)
-
-src_install() {
-	qt5-build_src_install
-
-	local size
-	for size in 16 32 48 64 128; do
-		newicon -s ${size} src/linguist/linguist/images/icons/linguist-${size}-32.png linguist.png
-	done
-	make_desktop_entry "${QT5_BINDIR}"/linguist 'Qt 5 Linguist' linguist 'Qt;Development;Translation'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/linguist/linguist-5.15.1.ebuild b/dev-qt/linguist/linguist-5.15.1.ebuild
index 4aa1294c58f7..b1887a6ebd67 100644
--- a/dev-qt/linguist/linguist-5.15.1.ebuild
+++ b/dev-qt/linguist/linguist-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index 0809da018c2d..e27d944220a2 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD pixeltool-5.14.2.ebuild 440 BLAKE2B c8de9ca25dc57ba59bf147d678e4428f0414683896a489d53fd58ffef95396435d5d9063930883b83b9cbaf22abf05730e9df888cc6835764b99a9c6e6bbaf41 SHA512 53bac3ce7ebe7c335a9dc6c8ef3dbdde403012eb4db5d0d9535712a14a1f0e73f792e5aa2c27ddcbe2f72413958ca942acea073eadde2e0c818f5fa187d9f046
-EBUILD pixeltool-5.15.1.ebuild 405 BLAKE2B e71c36bf636967f1ef6968c23e636f82dbeb62a5434b0a166e907d6ac561bfe7a68a851d7715a6565a90d4caca0d6ffda854a1d36f5d4b6592c19632379ad01d SHA512 2b47cbd2710c74965885131cb47cca2e3f27641b411310731434bf99f87bc651dab9e689df48d286d953ada2eaeb9aeb54497155d92c315e1d6b68d09e974fba
+EBUILD pixeltool-5.15.1.ebuild 401 BLAKE2B 5d59fa32746c3a87387ec244e0d412392eab05ebd7b590e4fbbadbff77c6a3a078d05227db2d9c70ba7a26f14d951045a6ff31b6b745b456bc11a004b413419c SHA512 67f0033e562484c447fa18b6d0df00624e5a7faec33f4013c14b58e7f0098f65288b0b51ffe1af6fee9699e1c65360c4ced961485a6e02c4a8b30519134af800
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild b/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
deleted file mode 100644
index 5298dc39f7bc..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt screen magnifier"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
diff --git a/dev-qt/pixeltool/pixeltool-5.15.1.ebuild b/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
index e3a011cfcd6a..9ace8946bc5b 100644
--- a/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index c71b48214adb..54cd99bee305 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD qdbus-5.14.2.ebuild 471 BLAKE2B bcc4f3cdf2b2de05070bcd9f6a2370ec2e0a8ac30450216fbde37fa20761cf7168cefa4dd515ee4e6f21e3b98c22ed0b3eb8e82617ef2fa32a9d62e101acc422 SHA512 c7ecb744185e32d5d5a53823e9457eb955bc87d4ed426b8ef97c4ad17f490ec1dd24bb4d3cc321bd5a5d92f2f1b37248ae84e7d024b51df1a3871819191712de
-EBUILD qdbus-5.15.1.ebuild 476 BLAKE2B 34f4df2e5943582cfcff2177664f4edd839c8498ecd4efada2813fd7d8050b8b4edf1560932abebb10d75eaa9050c67442a7efb52f56af2918ff2893c0dfe895 SHA512 163d32a8f8151702c8ad0132c00ea2fc175ade4cd67bfcb173e592df5c716863ee798af1480be36d397a21b915a581a9fe873f79db6714d4ce9db2fe9b549fb7
+EBUILD qdbus-5.15.1.ebuild 471 BLAKE2B bcc4f3cdf2b2de05070bcd9f6a2370ec2e0a8ac30450216fbde37fa20761cf7168cefa4dd515ee4e6f21e3b98c22ed0b3eb8e82617ef2fa32a9d62e101acc422 SHA512 c7ecb744185e32d5d5a53823e9457eb955bc87d4ed426b8ef97c4ad17f490ec1dd24bb4d3cc321bd5a5d92f2f1b37248ae84e7d024b51df1a3871819191712de
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.14.2.ebuild b/dev-qt/qdbus/qdbus-5.14.2.ebuild
deleted file mode 100644
index 0446d75dde0c..000000000000
--- a/dev-qt/qdbus/qdbus-5.14.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Interface to Qt applications communicating over D-Bus"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbus
-)
diff --git a/dev-qt/qdbus/qdbus-5.15.1.ebuild b/dev-qt/qdbus/qdbus-5.15.1.ebuild
index f9addd8e1919..0446d75dde0c 100644
--- a/dev-qt/qdbus/qdbus-5.15.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 2b1922744227..60b59522ae13 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD qdbusviewer-5.14.2.ebuild 959 BLAKE2B e768bc3d85d1db526d6f852de08eb76df04469f6767eafb3c080796ab66a2e53682e3014e42356f1c1d67488c2a7d4816ab598b56a2f77b121c7ba44523a88f9 SHA512 5f5301fb0466194146cb056aded0186ebb4f3631c6be4e9eeded83f5e6f2d9346190840d53261decf06a081f09dcfafaec998083869ff522c7a9daa40da23d71
-EBUILD qdbusviewer-5.15.1.ebuild 963 BLAKE2B db7f273d2580b43afc158c10b0e487313795a7fa4c3db3e5ca52a20c4801a89b676f0be5a8579c0a16819ad9f65f19b582445d616c3725315eccc5f36551e296 SHA512 240cdfb186a95205d2b548204c7e033ff4cb79f7fc0c33b0a60661ca7d2d0306f42e6a327ef8b633883e55649db8f32536620a26bb4c7b2e5ad17d53d735a4e4
+EBUILD qdbusviewer-5.15.1.ebuild 959 BLAKE2B e768bc3d85d1db526d6f852de08eb76df04469f6767eafb3c080796ab66a2e53682e3014e42356f1c1d67488c2a7d4816ab598b56a2f77b121c7ba44523a88f9 SHA512 5f5301fb0466194146cb056aded0186ebb4f3631c6be4e9eeded83f5e6f2d9346190840d53261decf06a081f09dcfafaec998083869ff522c7a9daa40da23d71
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
deleted file mode 100644
index 8fc278009e48..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit desktop qt5-build xdg-utils
-
-DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	~dev-qt/qtxml-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdbus/qdbusviewer
-)
-
-src_install() {
-	qt5-build_src_install
-
-	doicon -s 32 src/qdbus/qdbusviewer/images/qdbusviewer.png
-	newicon -s 128 src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer.png
-	make_desktop_entry "${QT5_BINDIR}"/qdbusviewer 'Qt 5 QDBusViewer' qdbusviewer 'Qt;Development'
-}
-
-pkg_postinst() {
-	qt5-build_pkg_postinst
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	qt5-build_pkg_postrm
-	xdg_icon_cache_update
-}
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
index 8ac73f897b2b..8fc278009e48 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit desktop qt5-build xdg-utils
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index 34b948faca89..4a0af399be2a 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD qdoc-5.14.2.ebuild 867 BLAKE2B fba9b6fb91e4bc4ba528ff3919840dfca637e09f3ffc7d4c6f8f6fd5f64a9313e968dbcb3c00d7c84234aac73f6b8080f3f2589d5469767e501246216e6130ea SHA512 447c25f1f4cf887e5f7c6c440d091b78e6c504dfc044fa5f068bd55af14d4f637420ab7eee6255f6b7d0a20b2215a87c3ff556a41abf0d2784a272843072e75a
-EBUILD qdoc-5.15.1.ebuild 519 BLAKE2B e793a765b545e1ec50db53c9fd2549e5fc4c7d432daa95de9fcc4fe0921144621beabef696934c0fa1fe53d716820b2e2ae04c4a59f3a4201235516a03947215 SHA512 7810f3a333edb7abfd59349840f544d02468e57bc6c8fa47e82f0d60723ecf8891f3b5edb2cab6fbc07732998178b6c6a1849d4d684bce0fc3fa2a8483b050d9
+EBUILD qdoc-5.15.1.ebuild 516 BLAKE2B 65321f642cc2714fc171c0c1d76ac291255f1e0b0aaa330cd88dc1bdc196f8c0f39707aa6e204c0c2dd2ac408eb41f45afa97934499cf7e0be1009199c820cd2 SHA512 57e1ae83c0458d93f5eaa95e4bc235bcd66a52b2ffdc18374075d037cfa80bc13a20e7f448349073c40908a12c6418b372019b47be058e4792ba7bb15add87b9
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.14.2.ebuild b/dev-qt/qdoc/qdoc-5.14.2.ebuild
deleted file mode 100644
index 989eea074d82..000000000000
--- a/dev-qt/qdoc/qdoc-5.14.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-devel/clang:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qdoc
-)
-
-src_prepare() {
-	qt_use_disable_mod qml qmldevtools-private \
-		src/qdoc/qdoc.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	# src/qdoc requires files that are only generated when qmake is
-	# run in the root directory. bug 676948; same fix as bug 633776
-	mkdir -p "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/qdoc/qtqdoc-config.pri "${QT5_BUILD_DIR}"/src/qdoc || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qdoc/qdoc-5.15.1.ebuild b/dev-qt/qdoc/qdoc-5.15.1.ebuild
index 9052d5178e7c..e7c033a327ea 100644
--- a/dev-qt/qdoc/qdoc-5.15.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 50693bf4f908..271ecab92cbd 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,58 +1,3 @@
-DIST 5.14.2-0-202003291239qdoc-documentation.7z 548115 BLAKE2B a3f889d3a5a3a28dd59d0cfa34d15c3ef3609e971feaf9c66dfbcc4a2e2d085a2f1288a576d67b8b3f56572b17c99e1483b2f3411797efbc43c75c38100be1bc SHA512 61f9e88dadc1b06a548e2ea2cb5d9a07710f88d8997983391b105e0d5d0bb61ab248d49ea5ba90dd88c902ed9fd28355a9f730667e5fe10300203ca2a54b0674
-DIST 5.14.2-0-202003291239qmake-documentation.7z 338952 BLAKE2B 9cef2a5cc058eb3dd8f937b60c798d786d3ae4a3cc1c750a8a9aa6535f44322212f54c6d9d6b89f77636eb4298445645764af2b89edbd47eac111778ed8ccb09 SHA512 4e4108898847fe75c286a6c445db8b75aa92c2cc260a425bf04575de18ac0e775a4f289fe5b814e5cbd00724e484c8c5fb6103b89bfa46eaf6c1c5248e632cf0
-DIST 5.14.2-0-202003291239qt3d-documentation.7z 5839936 BLAKE2B 0dba528d2b88b9f294bc92c6c05602d229e537de3215839116b9435e0cb6d49e57c3d69bd9ffe8e3f84dfb17c41ffa96f1cbf9b1ed303db08139cb818f445799 SHA512 c9f6eb528db99913e9d00a0973d8c12930dc319fa7e56f625e5874666379e5012483515b3382306c9515a2c5e1ade196bb8dc90587e13ea290a8bcecd64418f1
-DIST 5.14.2-0-202003291239qtassistant-documentation.7z 452240 BLAKE2B b16632f75a16b86e086e575bc5a1fe37dea7bd2da70baa057c2fad837c2327be760c92034c108a0df271c5f3a9c7ab74199c15a4cf6c33554d82a0196c376f7f SHA512 7364bce0517161ace8593e2fcc42e6b8cf402db96608dab2b647390905c3f1dd1ab47fceed54c6c3b766f97e16387e64f9fb444a7eda8f76f9cb79967b4ba27b
-DIST 5.14.2-0-202003291239qtbluetooth-documentation.7z 2137974 BLAKE2B 1345822a0bec50fb2613fd47f023ef331b82631a39af171ed22f9efba106beeead5db96a6a39f298581f64c834a42bb7a700a72c0f1da169b4e79f62268de839 SHA512 5d4c6e550a238d6eaf1c599d2a4dd2d22fa096b1d6024a3a9309a14fa3394af81cdd641b5256754cc808656dffaf1a985c4eee4b35ac4fed3b627781527dad94
-DIST 5.14.2-0-202003291239qtcharts-documentation.7z 8724264 BLAKE2B ff7035a2c8d76cfd993a61aa5090596537b9cf758c147c9ef14bf901224d143e9cff772762f8b073ba48f71af068cd27771e84ca4d580068e058709df28d8098 SHA512 388e783c46d81ac8dba57dc7a7e40d09c97384f74454008948a4a66ba7bcf513a3566e450e58ce356475e8afbe42e9a70ec35c36bb8c8d7abd12eafc3be318e1
-DIST 5.14.2-0-202003291239qtconcurrent-documentation.7z 122431 BLAKE2B 79f0e929d462080ff89798d9085cd9e13afddcd96d468c91aa30f81529be60d4f54be7275eef82cbe17e45f6dec0e4f74a4da120cb23df50b643ddbcaa180667 SHA512 443c91b2159ce82e3ef2791abe74ef2e6fde0560bc22f343dd6209974440fcb40b491a3d67691fa4150968af139331a1797fa428df76227ca24086db746cc841
-DIST 5.14.2-0-202003291239qtcore-documentation.7z 6523725 BLAKE2B 7fb8e451eb8a20b9e8f276efa3395205a895a611e3fc5233553bab4c822b01ef4d9313fe73dc91b6465612f78332746c13983517e19df37fd3614c4c27d364e0 SHA512 c932390025ac31a2b9b9251727700624f4b3578221f133868a133c467d0130d8d8d5bc2910c35dd4ad0a1bce306c722c437a8a3e4924968ebf0dc1d467b0f875
-DIST 5.14.2-0-202003291239qtdatavisualization-documentation.7z 6106581 BLAKE2B 2814d1eeed7f92814d39ecc6d434be187728a09615f5346f2c8552befba105c893467ca2c56f9f48d3263ff309c7b947e9cd8a6211923a4a0023cc66a82bb701 SHA512 f9e0bde2d88da6e3bdf4606b0711b062b1f4a0039b4722dd6dad969b0cb0942f471adcc089da5fe1532f472ffa1ad562824b85fc4e4f3fd25e1b14e8783f240a
-DIST 5.14.2-0-202003291239qtdbus-documentation.7z 396511 BLAKE2B 5e8812ea9c964a1c2cbc1b66aabde7c58650966a6918ec8b74e3456b63e03994dda812d70d53df46dc1e63983fd9bb094c231140529ac02cf8a7abde55757ced SHA512 7e9453ebba72fe950abc6898a07efe1e5428059811e0a6c7f9018bfb9badcbc772d4bf9c63b4870f8da4b208ec555d91263bec5e562add1e432cd8c9dc13ff70
-DIST 5.14.2-0-202003291239qtdesigner-documentation.7z 3531000 BLAKE2B 56ddb89623ae6ed02f3f60b91b784da636eafb4f6e74b63013475a4c3cead74b945f92dfc82eea973dcdd8c0ea0fa3acccb5c7f34fb1def4d7d6452bb8929602 SHA512 e582ad0adf4b5f33ab0b32a0e7db71483908efe2fd56e42102a28ebd050b21517c5d5420100816f8d43ab89040f62189db4d80d469d24cdc738696d224c6552b
-DIST 5.14.2-0-202003291239qtdoc-documentation.7z 10116385 BLAKE2B b631d107620fe8f9018848fee343a775e14cf02cea9d1fc4c0170429def5dec52e44a52babf2d047934a50b6a287f61411a42aa2bdc08c13b59550dd7208af2d SHA512 0994508646d8e52dcb013ea1326070276f0d6fbd7fd835cef3d78371a24b15792bc6ebfc905bc926191d2eb47b1a60d9e75edf66ef9d3e07bdf20393811d18a7
-DIST 5.14.2-0-202003291239qtgamepad-documentation.7z 238732 BLAKE2B 2e24aed01ecb77d28c476a077663e3e289d7bb8badad74e8a5f20c9a64e056995263bdb9d73c44b34f0cc3358e165604aafb6db60c1130da27c2eb6493a92a87 SHA512 f9b33da7b7824bf12cc50f6ab4dbeac180ff6a938de9bbce1b04bad400451fcfea74e55e15f4f39218a6f63ee9f85c0c4db89122bdc1bfdc5f90220644edda06
-DIST 5.14.2-0-202003291239qtgraphicaleffects-documentation.7z 15994331 BLAKE2B 35b6a3ec3b6325ceac1009779ac5e1d28497082569e67e644a8800e4a89c09f55a6a994baacdce3e3874cf0f969525fd15691c2fe1dbd63a3f90228a6cafbcf2 SHA512 8d50be92bd25d9e70c90c1cd3a62beb08161d1a16590fbf281c9098761adaa40bef56de66c27e101cd6fe409fff560a185b141ba5f8eee8fb8abda86bf88fee7
-DIST 5.14.2-0-202003291239qtgui-documentation.7z 7431093 BLAKE2B 8e32dd369f9f21fc3b6d4f71d04d2df059a60e41d4350b53df7f9d0c4beb5498742e8d499cbc0eea970c1f107b445ffaafff68f087665221369c851ff66842f2 SHA512 1b7633f7b0b3647cac60e7fdcdf5040743321867e8c7583b388d451b40a72322c293e8fba8014a5978ae47934d3a7081fe954cb2471411cdbeaa636d6d04558e
-DIST 5.14.2-0-202003291239qthelp-documentation.7z 199198 BLAKE2B 5e04b96af4eb27446bf6eafb00c9338c37f09ed5ef4a43b9e33fdc63a992471ffbdf49e860205c93ac795863c8f516500c717468c27e9798618511c3ae9436b0 SHA512 4e34cc37c01096feda4fc6e5422749697e4f1990bf2a3d9c756ef5b08f73ec93837236bc30ba2aa6e2a6a98ddfafb2e92d650ddcb8fc8dc3d08f83247f2a2fbb
-DIST 5.14.2-0-202003291239qtimageformats-documentation.7z 29042 BLAKE2B 64b4c90bd02d8ac93009f11ab923a65b5182ce11c44268e00c32c50c80fa422f555c3217ceb2ebccab79dd85ea5e2b27c1a3c48714752dc35dcfebe33cab54da SHA512 84c4eec9c11f41d236fa391ac9dab32647221972720f70446fdd6007521ed41039ce4fd6a28464087861e1c80e9077bc880b2fe1a2f5ae7c56e3a8c1508cbb1e
-DIST 5.14.2-0-202003291239qtlinguist-documentation.7z 968571 BLAKE2B 04aeb56ca406cea61a3cb0dd898fba7b1a5b32369d947ac3a293d2f1d3a3a9f5b128e02a734f6da4d59ecc7f14cc03079e99caf3df13899fbabf2ddf1a987865 SHA512 ec807c1f824eaa0181d705fc5dcf6c0e855e83c06fd2ef0ac3e351c83e099613a1fc437714a2bc81ebe988f72e8f481a6ee0d33770a78ab7df8982e93046eb9c
-DIST 5.14.2-0-202003291239qtlocation-documentation.7z 2766777 BLAKE2B 89f2e8b74f75fade05045598ef340c9d5b0f9c459a941670b058309e780eb0295676116c09ffffad795591633277306d29ec8071b98c349c43908b1c25b7c13e SHA512 74fd76499dfe8ee8b0fde9b97af290784707021aa446498509c92b89db559d2e5050347050efc7f111f2eada2cf6cca941d7025f58dd05bdd44373f600799b3c
-DIST 5.14.2-0-202003291239qtmultimedia-documentation.7z 2802759 BLAKE2B 1f616a2b8391f659a83ca165ae31410af7c67d860c10b38ae06d4ebd774eb3b9bfa7ef7e405b8ad4bd0370cd915f4dfd5156390845a1ebf748ae30704bcd464c SHA512 fb4234ab57d70a5f92f73d91b23d8e5731c75a914ef213aba5dc5e7f868e142b4d647bef50d048b2d92a4f98c695ac57bf8fbcbd603dda985aaf1752d6010219
-DIST 5.14.2-0-202003291239qtnetwork-documentation.7z 1499902 BLAKE2B 68fb52b35bc38b602ab1a7c434cd8b07c75e4747e43f7b165eab5b32669279d0396eca99c79d825f59646df75f82c90b8e066add39209adc2f25b5ad0db59ecb SHA512 c9679aab71c645cbc8ca73ac57b7b2da994c69998699c533f4bb84821147a920b974474c9df36362adca054bb1a8825be5e1ab760a069acd04262581922db368
-DIST 5.14.2-0-202003291239qtnetworkauth-documentation.7z 244223 BLAKE2B 7e883362bc9c692999c073554b3b306cf8de55ce37e9ea73f558ce9f4f6f1359db1c4365bc080a5cf0a64abddeb8a3f63ffdf71c6176fa1b1dc4e9fb112633b6 SHA512 cc86171689e60fb6cd885f838a13603652d216b46956106b03117ed4f9c4bb17e57c9c77267b146076010e08a16b966274ee39420757372db110a187e6da7b9e
-DIST 5.14.2-0-202003291239qtopengl-documentation.7z 836338 BLAKE2B 4202512854b7f1eb0221054a125e6ef987a3acc80683cfc60abf83708a5a52685f3283dd79807b74c8845c26ca84b7d365e8c729648d9084ce2d742b932f3bdb SHA512 a0b7309f9b183867be6bd4132992e4f258770afa5b7488377835db4d3ffb64b8a8abecab438b9de8e557b492da5183a66f4bd6822168da71f65e611b96204a99
-DIST 5.14.2-0-202003291239qtplatformheaders-documentation.7z 78675 BLAKE2B d4ead7ca1511dabd6aedca080ad62860f520a87103f09d82de247889d4ec5e5e6c26d5d136a9c1cc5280c13e9b0972da42a1ebae6715b2b5aaadb4b83b96b693 SHA512 ac836a953fc5bb51f8bef5340a425924430422a9b1aa949a9e2c28a2a9ef1b10eb2b60fe2c58945b8da2b60824c40b516d6c30877325de2483ad0ceb36da05eb
-DIST 5.14.2-0-202003291239qtpositioning-documentation.7z 587458 BLAKE2B cfbbdca9664da130975707b97a0a04c21fc8677be3e1368c402c30a00d2c68f06f5927e711c432eb14589440a14d4df20bb8cd3c7131db2e18e413f4bae8ed92 SHA512 87066ff7f35a664ef1c5f3ec8c28827b445cbd56e40501c5a152fa7fc4ded10447aceb03afef57a21ae2f0502f1376e3133db11948b2d809261a228117d40b4e
-DIST 5.14.2-0-202003291239qtprintsupport-documentation.7z 376410 BLAKE2B 65da643907e6216d3b8f67dc504fb7e9838a17493ddef8543259512aa39c6a81c9ecb69cb9bae9f85e4439c037292fcfe66ff5ad9896a38749fcec507a303011 SHA512 d6afb912757c722c8371e1a4ecc61ce01a5a5f3ae9ac581a97b25faed3517fdf189a41c84df78e89ea81ff63c2d4bf8ab3bb25d42f28a863699dc14a9c950271
-DIST 5.14.2-0-202003291239qtqml-documentation.7z 1526503 BLAKE2B cf17ff5e2a953a7df579bd3b2a39a4e604dc8e9a240ebbc60f7947d0c4d91b62bbeb8ed03ebb80deed63a8f5560e68c4a31f0347038304cac96a68df3ec273cb SHA512 21fb46fe61bf74000a364b62c55d7896664d5620429f62961c97d1c018bf4922662978bec32d8e7c95e9088f91d4ed0cf567f3e6d5e550e620797f394e5a496d
-DIST 5.14.2-0-202003291239qtqmltest-documentation.7z 81719 BLAKE2B a99e255af7d6aadf1db94b17cdf81ef39babbb937dbcd462f073b7acff8b51bb6fb9b1d51e9b731196ffa90083139d46c3707db8f646db1566ca6d71fcf6dd17 SHA512 6982352ca75111e1b7a0fa78675ca4f40c29b153a5908670442c78f4acfd349ae89d80ee1597a1dd08fcd0874a82f2846b26df5c7e9d4592e23b59489b59a4f8
-DIST 5.14.2-0-202003291239qtquick-documentation.7z 16639611 BLAKE2B 3b33273a5b110497f59e5ddc6eb0236a8fda86ed6c172ab36abd36a6ac05cbcdba2170c67b12fbee014f8a17c0546b454b8ed2168533ccd517f10614aa21a8c5 SHA512 78c3a1abf5d0ea503cf19d165125cbee91ec04807a52333410b97b35847c2123eab74988c119a7a24daceaa13cd95bc6d7a10b70131ab7d289e128e7b6a3d8bc
-DIST 5.14.2-0-202003291239qtquickcontrols-documentation.7z 9331828 BLAKE2B 08d52b7c0213b20226d46cd1a5a715771c3a4938b05ac40021006d7e5ff7c45fccd69bb728698e71e50d95045e9c26d5d05da38214eeb390c86ebb93a7c49057 SHA512 d1aff40d5fe89dc2d14d5755fe3d39881c00e922eab3828c93e2b448270263a6a79fb43a9df0ed72b66325477f015d2145b35e75be179575d1a4450dc82766df
-DIST 5.14.2-0-202003291239qtquickcontrols1-documentation.7z 1961340 BLAKE2B 46b1795874e9e29019427259c502ddd644c5de6e985700416fff1494b199b6f518fca17e07168cb3de1a201a2754518c4055559442301254f2bd86e87b1c354f SHA512 bf715dffa72e0369faa159d67ba9bacf31154da382a87a031577729acf7caa51af55cbf2fb94ab529afbfaa5dd65f1a011ef8e52b8ce764dbfff037358d0f22c
-DIST 5.14.2-0-202003291239qtquickdialogs-documentation.7z 183373 BLAKE2B e1b1d4ddb85ce48e9c744ce7566f1ec2789b2fcf03f65c2616fa63b2a7ccdabc0a2ab60811bc723f3e9aa4bfa304b04bcd5097b0e617dd4f8c72b19d499e2ee0 SHA512 18a0914c7d398fdeb065829e9f93f51efddb58c35e43962fc891a46538807ce7dad27644acd976886fbb441e8b9e35790f4ed1271546a155da38b9dcd803a027
-DIST 5.14.2-0-202003291239qtquickextras-documentation.7z 673822 BLAKE2B d06bead9f468325f1457fd41d047797f3618322131e5fbc095c1a78e0926b020a5f3012f86f251c96d52e8d52b0d79c05f4639c19338d67f0e6de65901bb5af7 SHA512 d6fa5acb6558fc840d731da25d9061fe3dfa4e3bbb47354bc8760afe0431bcdbd1cb21491416d7773bb171108492b35e14d2f5df0fdf67e307e3ccd6fa0cc598
-DIST 5.14.2-0-202003291239qtquicktimeline-documentation.7z 149836 BLAKE2B 28cc7173aea37167a7aaada170bb0fa7fa378ddf270c6237836c47bf2b741aefd7f0454e33be4c089742644bb72b91f9aec1e00d54d837790b21349d1d66092b SHA512 b92c321d486a49a586569dd248cf9a6f49a5acb7806bd3ba60e1f29b85919d2ef79749cef644d9f53be5cb242ef9475bf1358e38bfb4bdaedb4b02f2f90de86c
-DIST 5.14.2-0-202003291239qtscript-documentation.7z 601309 BLAKE2B 24b63ae7f20f60d5e2b2c1cbbc5dc47f3f19cc1bb0bc1dade609bcb0a253f483d49359a7b2f9f508936a8c3d22802907fdb64fcf388e4c6b42cb60c6b154f2d7 SHA512 8cbff7316c0b0f2dfd302b374bb78fb6b7f4f466e886299d9c2aa22097ff2b871e4a41bad2f4262c49b065e13892f1e155f1dd6aa179b9a9e898227bb0641d76
-DIST 5.14.2-0-202003291239qtscripttools-documentation.7z 85919 BLAKE2B 9da6dfdc7bb18e4fbb6bad8326040e35e55ac8be556d8cc7e280b8fb481d56c9e26fa1f8bce4fa47acb0024bf622c2d46f99f5199cf0dd8412626c23f3b06767 SHA512 545e3b7cfe5fc2a76928e5c75866e350f2a80c7d47104171252e734e9d0c2966c4dae3100118730854f3de9bba7e1bc84167f60f44956730db0e0543a10819a8
-DIST 5.14.2-0-202003291239qtscxml-documentation.7z 622979 BLAKE2B 6243b5dc2c17eb6c0727174f61327a7a687a0af6cdc99a27d6f3c796f29358873e2fdadc2384341bf4ebe57078ada9ba2e9633c64699a280c1dd148bff273f29 SHA512 19e836eda1e1f7d9dc278a2195309665a0962ba4ba339511a2060217751de5288e137139833dc6e5825a7a5914ec66f234ceb58497058ae183f57b663b7b9cd3
-DIST 5.14.2-0-202003291239qtsensors-documentation.7z 3404679 BLAKE2B 33732ef14e76dbb2bb8e9a296eba8963f4ffbacabe2d6ab7521ae4c44fe44e246c32101f90a6b84bbf232b5172714eb5f9003e25de4197d53c18b60efc3767d9 SHA512 09146cc94ea1b97ecf5eff0127424dfb7e07bdf7751c60be58559c274ca29bbabf710b18d874a596548ebad2557804c1f2ea07792c3efa1e1692c0b806b2b10b
-DIST 5.14.2-0-202003291239qtserialbus-documentation.7z 367915 BLAKE2B 734832b230a62f9cc7789cd20821c0ef7bd627cfd5f28dbd71f522348b4da0c863dc276e35fd66a52a14e033090c68f0f7301f31978f61bb66e1d37c2d8719ff SHA512 9f00f877376cd0ddc847f907ae223acd0ca87f4d693673b2468a6a603f3ba2c5d8548588507f071511252311268e6006ccc2beeeaea45059ee0d7f4fdb0b61a2
-DIST 5.14.2-0-202003291239qtserialport-documentation.7z 278435 BLAKE2B 3ccc904b861ecce946945586122063c6bb383179e67d0a2324ec57661e91396ddd6e01c1d01843ea7b5da4ff23841f4162769417fef1eda1f8fcfb1e1bb5f496 SHA512 5e8e8c7d8d8315fa74330294dd0933713aa390fb52f39b4f9b90eeef74346d02fd4255f4e2ec860ddf8cbc4a06df13a371c78c7f1ae033d97a016c782fce5d61
-DIST 5.14.2-0-202003291239qtspeech-documentation.7z 134032 BLAKE2B 8d7671a8a71e8f112a98b9868ee5a0cfea4dc3eb63ff42fc60aaf9c5142be0b821583fafdf1cbdee2d66786f84949760d0be8a589747e2e811fd380ee09919e2 SHA512 e6eae003f852f04ddb438c73f02346e5a8040f206af8e444c5d6e28d8af5988f8f24a3c1853496a7da545a8fca1ab2f9ce6b7b4d3e9a8b7d2cf35d70e32a8cfd
-DIST 5.14.2-0-202003291239qtsql-documentation.7z 882769 BLAKE2B 5044c05764d02836f1dbc05f60fe969a4463d0f48c8858fabdebcdc5b374482e92af1deef80775adac202a31d9cf81b1c02e979d28c4d8024850f9a3c66b9942 SHA512 be3381013c78ae871ebf8e1ba4978b0845a1ddd6790e67ab5799a6d59e3d70ce0467f81aa207f9c3f58fb5bd86264b8a8a2a7336c7ecf6cbf6e75e4f7b7273f4
-DIST 5.14.2-0-202003291239qtsvg-documentation.7z 252552 BLAKE2B 516068324ce1d2f476c10e3934c96cce5fefa3f31511772614486ba71f5bd2facd9f3ac925769bcedaf2130651e6fa0aa67eac05dc351f1b65353150597ee14d SHA512 387b822eca333ef8226c79cdc55146fa5011165edae48fe06ad8fe9d951191a1528273a9fd14d7f60e9c1be49ef3224474a7e1ebda31672f727aa2c37c277541
-DIST 5.14.2-0-202003291239qttestlib-documentation.7z 219524 BLAKE2B 33f6d3dd6d217c7eec5d6ec4e3f346e9b263123be1d802cadf3bb1a15247ab02ccf768e0b5b1b98db32e5da919a1a4fdbaaba85c5ca8ee6d4d76d97fe1ae1be2 SHA512 4b7220b7473138729c48c135d70f3b2631d7a60461617b0bcdea30ce18917aa597d56cd5abbd1827e9701e17695c1bebacd49091dedea48ec908e3d0616a9fc7
-DIST 5.14.2-0-202003291239qtuitools-documentation.7z 158530 BLAKE2B 970493230cd91086e29545932ea9e7699aedc2bf68e0ea9b46682ae012074b5bfcb9845704714d9c3e653c77160bc4b9914405f827e3b3783840aacc18b88bca SHA512 531d9d2ea2796a7142468fc63b7894385299ec490b480450d160e6e1861d300582d19ea1cda706554a58b0f26438a4dd509362ffe05323a37445767d96525677
-DIST 5.14.2-0-202003291239qtvirtualkeyboard-documentation.7z 2037666 BLAKE2B f741913404fb8ba1747b785579e4c4c3728878c7238287f1426b32498def5019db2d2baea2818cf66f377ad01dbf0a5e3a2f5b3121efe4edb2a58e299ef2c1b5 SHA512 686ffc453726eba33d1cb6765cf3a66999f0f6ca3020ff20e9e6c1dc010f458ca88136c8f04c50b89fec7bfdf0dd54f62ae66e4cc43f9dacb77146517efc3d80
-DIST 5.14.2-0-202003291239qtwaylandcompositor-documentation.7z 586165 BLAKE2B 7f3f3046950301052fe6bc3fd611537290e9949b40939094b4595eb36f787e39ad5d678e42b3dfcb4efa149c7add225569a68b5d0f6c1f85f4d7680b38849be7 SHA512 c518c03515e21d5d3bbcf03cb1b704b9fb24be178aa9fae2d478d152d97c3766476b031b5e170b7b504344121be31da823ddfc5110217caaf99eaf0ee11e32c4
-DIST 5.14.2-0-202003291239qtwebchannel-documentation.7z 163023 BLAKE2B 594bf502959024a63365ed4098e624c5bb9627b40a98d98ed9a3e8d0bb6447a29e85385d94ee2039b11099cfba3da93d0fac2b772447c425d096a07947471faf SHA512 05aca7034070847201a4011d2b5952cf526124d8f3afc0cba5b03511b50f54e892e280465ccfed1efa849391babd1ecd0f528b14c0a36294a999be43fd4f2bc5
-DIST 5.14.2-0-202003291239qtwebengine-documentation.7z 2983056 BLAKE2B 97b3c0558e7d2a0c91bc9ae62d5bb78b3116f5b3586bb8d0a9bffd58a9e0e9bbc1a1a0275cc1869f84291d26e1ddb6d4c39605a60cf0f4d2942373ba80859312 SHA512 cfee5d5a76c05d668fca7dc6bc342d1f2f9e95a34c5782805069d1b260e5e3793d7dc0db1c6a1b3e96e8dec38e48e226c393c08fc354c7bb95dd889f27cbf93c
-DIST 5.14.2-0-202003291239qtwebsockets-documentation.7z 306861 BLAKE2B e7715265e92039d953d4bb711252f6ced098bdd227ec44f0c8597cd0bb021b2f4a9ebd76a65ad416dc91afaa04c0af538786160c6045b5bf60ba087e8b53d13b SHA512 0879de8d72f6e8201677caf3f7d26b4f1761f13fd8dcbb1d6c211663a16b96fca487f5fc96acaa77108ba148fb0fd1733af3a4ab35dddb5e5b5fae377de07cfe
-DIST 5.14.2-0-202003291239qtwebview-documentation.7z 120314 BLAKE2B 22bd0a4a09a9bf35679095ee06416a6285abb8b40d976168d63d9d0828dc5992887d1b381a530aac35259943141b2afe55c4769ee65fd5083d34e7b76132fcca SHA512 82c7e399d0468c6548e526f30315af6ff3498ca846c2c762139fbbc75ee0006edba4a5e921d60a2f5200e308f678fe45914144d5aadb28e79690af29c9a7fc09
-DIST 5.14.2-0-202003291239qtwidgets-documentation.7z 26796173 BLAKE2B 6383a2be3148bd0d40d09f8ebf044b3ca1f5648de0813ba21892246edfad9da2d6ff66e45495443531f840e762517caa399401f0a0de80ca3ccf181d378c7c78 SHA512 f81066289080709bad87c529be13fa16b9652d35d8a0f1671d9aad914101c6b9a934ce5504cd6133671cbe0cefaf6174caba3b0bc5e46741d8329ad2ed42b908
-DIST 5.14.2-0-202003291239qtx11extras-documentation.7z 36888 BLAKE2B 0f7757cb82a7fea064e9b484e08cbd3b1cefd5f29117ab283f0b26ffddae142e494f674744f2fca4f210da5c86b86500ef26781ca7e5bb0f13b0c12af9195d4d SHA512 728814ee896cdc429e843bbdc136931795d54b4b70bf0d54bc8ac9b8edac42986981d39c134f3ea5329984a9b15e0f0089df716c44889cf13368fef92cbbff5e
-DIST 5.14.2-0-202003291239qtxml-documentation.7z 499466 BLAKE2B 82ce65d6c4dfb39aa3202e20acafd0cb970e57ef24f35a2c4d64b3a550cc3e041b8bd2e74489b4738651ff1125247ae18e7e2885e919346f0b89776c36697846 SHA512 62b7d24f724721bb007c4de36bc2bb9578cb719de8acac72c5c144e1acb4a12a0a15930a3f0b8aff3ed557f236d2ab124045f86dc33b2d195da05e61133fd100
-DIST 5.14.2-0-202003291239qtxmlpatterns-documentation.7z 1193876 BLAKE2B ac7c92c265fb0bc4b5ed7ccf267c50389ca840bdf91a35abce127e14608e585b20191cfe84924864e2fc607b4d360207e50b85424c8517fce136d971de2c47a9 SHA512 2d012722d64b27c6ec11726e5b457ae1b87448e681271809489ea521ab0ac65553dc2d8c105bedc65501abc5af7d6921afc2d3cf5ac69fd17548405076f66146
 DIST 5.15.1-0-202009071124qdoc-documentation.7z 538292 BLAKE2B 2bfddf75b83783a515f7278e4c9e384e96d58a64f5326d640278dce7d730e011a0fd028ce41efb43d47c36c45cb378101a78c62779600cabff6c108db7146af9 SHA512 48ce574f1a4a888a40ed6ea8b81bb3baaec538c15c534dde15038eaf017bf97bf6714dd711b22a9d00332f4f79041ee20b27a4e0987ef98d48e7fb651df86f32
 DIST 5.15.1-0-202009071124qmake-documentation.7z 343276 BLAKE2B e4b4220bf97cb668b70021c3264713005fbb2b890cad7f19573f079726b84b181764789e0e46557eb8999ca84668e40b1c59836cd8ba4837f38754182d272313 SHA512 56bb705c4dde6e348bc995a0077b36c765e0295622490496d7c634effe5d9ad6e5f8a8239dd799ad0d61cbeb0d244904938d6e97ff91f761cc5f0c057e81ff86
 DIST 5.15.1-0-202009071124qt3d-documentation.7z 5832015 BLAKE2B d68bd281fcbf4c665f2b72602a4f2de779203cebdd870935f21c9514921062e1ca28d802f7d77779ec978752514b692f76f54487d0694c84397efadefcfa52bf SHA512 54d49afed958dc0231880d364c3385f017c72ab9226e1044b9d2b146685d5b5adf8fee44ed2ca58fa0d8f06fa01898724d570185f5b5995b93c5e028206fe959
@@ -108,7 +53,5 @@ DIST 5.15.1-0-202009071124qtwidgets-documentation.7z 26786725 BLAKE2B b17dbabf98
 DIST 5.15.1-0-202009071124qtx11extras-documentation.7z 36642 BLAKE2B c7b0faaaa1e8a39c57a40e38dde48c580c8a5c6907f134118455fc8c327aa4ffe0325856f879798c57d9445b2616bb9e3bc24c38fd5f12bf10eed8423c7a5bfb SHA512 15bcd109cd5218dcee95f24cf7b370715f6eb075b010472652657339393c4d187ce2d58140c901e1902f80ac5a648360f8ad1dd19358a2cf8be3d719a4d32ee4
 DIST 5.15.1-0-202009071124qtxml-documentation.7z 448276 BLAKE2B 2bc3fa07132270659ef0d1f5140f06897ac4ded4b0380695f721d35fd09c4a2f6e4251801b72c11147f6ae41dbdfc1c0b2d998d0aad71c0d48f1a8e15ede3b16 SHA512 a1a4d1f53e96e86f05fd371d31b12156b971d076d81b5e838af522dbffc6955d58f7b24c7f874bfe8ca627905b9817de8e709ffbb830f267ebb8603b7a58e684
 DIST 5.15.1-0-202009071124qtxmlpatterns-documentation.7z 1199820 BLAKE2B fc0287d1401a911602e2fa5ba17f52bfd1a42a9c7687ae809ecfcffea6fc0d0c6d3d8ce4d9d395d48ea85bd267968ef887a205e9384e4de43178b0c37eb38965 SHA512 0005e22be3a926d8965323c34efd06229d32a364f1937aaf9aba6e0ba8093b518189d9399aa1e6e3fc0d9204bac0e442efe534fdbbc0c9b2fcf4b5ffa7f781ed
-EBUILD qt-docs-5.14.2_p202003291239-r1.ebuild 3066 BLAKE2B eb79fd4283c765a71f5fd60c475bc0d9ce807a95ead1719ceaf2b37ed11e6e2bdcd2ff2db8e7960040ff9ae67e809319d26c132a1a2a7b06cc31a90f616bc1ab SHA512 664feddd58aa974de01a00b8153390b41ab5377cfc61599a45d227f73c6ed2d8ff2fd1d615e9d07ef05fcd69a1c55ed272f0c36ddd22d9fbf7c3d2ba22dce602
-EBUILD qt-docs-5.14.2_p202003291239.ebuild 2968 BLAKE2B 05273c473995b9c11c5070c6dc38fef31a5b742a71151a77b7b68148704342a8c0ad8c52ff74c9d270300761272f1195a69a2a7c37106fdb0404fad7b797df67 SHA512 0195382e1ccf86f7fd4567922077c636fd7dcff58219302b550037508232dd7ec7e7e036ef2a69525c1d35c4b64581e6f3c2d52c44b774f59fc6c9f85b30e939
-EBUILD qt-docs-5.15.1_p202009071124.ebuild 3176 BLAKE2B ae9d96061c0d36ebceb43dff3c430cee6c1c3cc757dc49334a4092af0e5dd95c42985eacf221db8bf755c8cbf87e36e6032905cbdf87fad1e6f720a32a4521ac SHA512 947914f10b688a77fedd24198a79db531b7618034e63a712023448cbf5ea79021fe074cd0b5bac263afb8d93028fdd3baf4680863ddfdea057605919f90f61a9
-MISC metadata.xml 3987 BLAKE2B 88a562c2f30685b8f20c14398020923ad320cfe14eedc8ca8bacb1ebce44857cc7795618376c4a66625ca30b50dfc0b348acfad8c323c83d10630af37d3e6b19 SHA512 0ef66e7526514436fcdece85ff01b17f6aff031a50ad2d7a1e86b04140d25de56645cc634290c41a1ae0dd077963afd7799341597158bf6d6d0b7a79c3884342
+EBUILD qt-docs-5.15.1_p202009071124.ebuild 3173 BLAKE2B b6cf1b4bff8664a8976c665a14cdda1ac0aff0a7cfb028310597d312ba40d9d60c97ccbecaea50592398aef7a1d757b7f3880457fccecf3cb3f2ab7ee426ba5e SHA512 20a690ee65cabc913eeacb1b8f494f55132d22fa1d40c26ae6e430054fa442a142d2f83f35713bb1334a466ab791347c29c1f96b0abe41f37d263ff841a82f51
+MISC metadata.xml 3909 BLAKE2B 1f36215a83c7a9368114a0139747bef6cbfb5aa88880b633c3433d17b1767db1c55d5910fa0233b8dd124441e406d79fda510bc0657c8ed6669e67394033977a SHA512 deae0af2cce3dde641f0ff94234bdc98cc6f929885d12ded8cf9e4c70aa4f54e9dbd94db9b885281d22ac37a0140d4feed98f60a45bc415dbf3f32931ae8ba02
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index af49c1ea8e0e..d54e1fe9c862 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="bluetooth">Install documentation for <pkg>dev-qt/qtbluetooth</pkg></flag>
 		<flag name="charts">Install documentation for <pkg>dev-qt/qtcharts</pkg></flag>
 		<flag name="concurrent">Install documentation for <pkg>dev-qt/qtconcurrent</pkg></flag>
-		<flag name="core">Install documentation for <pkg>dev-qt/qtcore</pkg></flag>
 		<flag name="datavis">Install documentation for <pkg>dev-qt/qtdatavis3d</pkg></flag>
 		<flag name="declarative">Install documentation for <pkg>dev-qt/qtdeclarative</pkg></flag>
 		<flag name="designer">Install documentation for <pkg>dev-qt/designer</pkg></flag>
diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
deleted file mode 100644
index 9014281d55fc..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PV_FULL=${PV/_p/-0-}
-PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
-BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
-
-declare -A QT5_DOCS=(
-	[3d]="qt3d"
-	[assistant]="qtassistant"
-	[bluetooth]="qtbluetooth"
-	[concurrent]="qtconcurrent"
-	[core]="qtcore qmake qtdoc"
-	[dbus]="qtdbus"
-	[declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
-	[designer]="qtdesigner qtuitools"
-	[gamepad]="qtgamepad"
-	[graphicaleffects]="qtgraphicaleffects"
-	[gui]="qtgui qtplatformheaders"
-	[help]="qthelp"
-	[imageformats]="qtimageformats"
-	[linguist]="qtlinguist"
-	[location]="qtlocation"
-	[multimedia]="qtmultimedia"
-	[network]="qtnetwork"
-	[opengl]="qtopengl"
-	[positioning]="qtpositioning"
-	[printsupport]="qtprintsupport"
-	[qdoc]="qdoc"
-	[quickcontrols2]="qtquickcontrols"
-	[quickcontrols]="qtquickcontrols1"
-	[scxml]="qtscxml"
-	[sensors]="qtsensors"
-	[serialbus]="qtserialbus"
-	[serialport]="qtserialport"
-	[speech]="qtspeech"
-	[sql]="qtsql"
-	[svg]="qtsvg"
-	[test]="qttestlib"
-	[wayland]="qtwaylandcompositor"
-	[webchannel]="qtwebchannel"
-	[websockets]="qtwebsockets"
-	[webview]="qtwebview"
-	[widgets]="qtwidgets"
-	[x11extras]="qtx11extras"
-	[xml]="qtxml"
-	[xmlpatterns]="qtxmlpatterns"
-)
-
-DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
-HOMEPAGE="https://doc.qt.io/"
-
-LICENSE="FDL-1.3"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
-REQUIRED_USE="|| ( html qch )"
-
-SRC_URI="
-	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
-	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
-	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
-	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
-		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
-	timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
-	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
-	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
-"
-
-for DOCUSE in ${!QT5_DOCS[@]}; do
-	IUSE+=" +${DOCUSE}"
-	for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
-		SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
-	done
-done
-unset DOCTAR DOCUSE
-
-BDEPEND="
-	app-arch/p7zip
-	media-libs/libpng:0
-"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-src_prepare() {
-	default
-
-	# Fix broken png file, bug 679146
-	local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
-	pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
-	[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-	mv -f ${png/.png/fixed.png} ${png} || die
-}
-
-src_install() {
-	# must be the same as QT5_DOCDIR
-	insinto /usr/share/qt5-doc
-	use html && doins -r */
-	use qch && doins *.qch
-}
diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
deleted file mode 100644
index 0aa5c59ac2d7..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PV_FULL=${PV/_p/-0-}
-PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
-BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
-
-declare -A QT5_DOCS=(
-	[3d]="qt3d"
-	[assistant]="qtassistant"
-	[bluetooth]="qtbluetooth"
-	[concurrent]="qtconcurrent"
-	[core]="qtcore qmake qtdoc"
-	[dbus]="qtdbus"
-	[declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
-	[designer]="qtdesigner qtuitools"
-	[gamepad]="qtgamepad"
-	[graphicaleffects]="qtgraphicaleffects"
-	[gui]="qtgui qtplatformheaders"
-	[help]="qthelp"
-	[imageformats]="qtimageformats"
-	[linguist]="qtlinguist"
-	[location]="qtlocation"
-	[multimedia]="qtmultimedia"
-	[network]="qtnetwork"
-	[opengl]="qtopengl"
-	[positioning]="qtpositioning"
-	[printsupport]="qtprintsupport"
-	[qdoc]="qdoc"
-	[quickcontrols2]="qtquickcontrols"
-	[quickcontrols]="qtquickcontrols1"
-	[scxml]="qtscxml"
-	[sensors]="qtsensors"
-	[serialbus]="qtserialbus"
-	[serialport]="qtserialport"
-	[speech]="qtspeech"
-	[sql]="qtsql"
-	[svg]="qtsvg"
-	[test]="qttestlib"
-	[wayland]="qtwaylandcompositor"
-	[webchannel]="qtwebchannel"
-	[websockets]="qtwebsockets"
-	[webview]="qtwebview"
-	[widgets]="qtwidgets"
-	[x11extras]="qtx11extras"
-	[xml]="qtxml"
-	[xmlpatterns]="qtxmlpatterns"
-)
-
-DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
-HOMEPAGE="https://doc.qt.io/"
-
-LICENSE="FDL-1.3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-
-IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
-REQUIRED_USE="|| ( html qch )"
-
-SRC_URI="
-	charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
-	datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
-	networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
-	script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
-		${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
-	virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
-	webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
-"
-
-for DOCUSE in ${!QT5_DOCS[@]}; do
-	IUSE+=" +${DOCUSE}"
-	for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
-		SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
-	done
-done
-unset DOCTAR DOCUSE
-
-BDEPEND="
-	app-arch/p7zip
-	media-libs/libpng:0
-"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-src_prepare() {
-	default
-
-	# Fix broken png file, bug 679146
-	local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
-	pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
-	[[ $? -gt 15 ]] && die "Failed to fix ${png}"
-	mv -f ${png/.png/fixed.png} ${png} || die
-}
-
-src_install() {
-	# must be the same as QT5_DOCDIR
-	insinto /usr/share/qt5-doc
-	use html && doins -r */
-	use qch && doins *.qch
-}
diff --git a/dev-qt/qt-docs/qt-docs-5.15.1_p202009071124.ebuild b/dev-qt/qt-docs/qt-docs-5.15.1_p202009071124.ebuild
index 14dde085d7e4..5298bc869f42 100644
--- a/dev-qt/qt-docs/qt-docs-5.15.1_p202009071124.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.15.1_p202009071124.ebuild
@@ -53,7 +53,7 @@ HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 
 IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
 REQUIRED_USE="|| ( html qch )"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index 0239bd07dbf2..b0c5dd5cb427 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,5 +1,3 @@
-DIST qt3d-everywhere-src-5.14.2.tar.xz 81576496 BLAKE2B 39077430fa58a14d0636ef56607b687636651d8fb798093d00b150ae023c462780245f06d61eac214560b336a1f445c2fbeca397c1dc7e7ee0331cc008692a3c SHA512 43053d001d59094bfac19c5bf3ad17df277c64d0c214b72d4cf02231396d9109a231da8d9d72ebe79822bc09ee24fa2387b4b120dbad43d69a49e3d66ee21da8
 DIST qt3d-everywhere-src-5.15.1.tar.xz 81919836 BLAKE2B e0c617e777dc2562caaee02483bb4c9ec2fd17214ea02505942b074b82e698a82e4c81ef552705872c6c10be3cbab65a1fc3c5aff2c87637639f223583a04ae6 SHA512 5d35f39bd3cb65a4b7490fd3d57a4f62b3ccaad25c7963613d67641927bdc9d895fb436d049de5485a9e8e067c716951e376349cbfc3996af6765adda73d51d5
-EBUILD qt3d-5.14.2.ebuild 763 BLAKE2B 8166e28c320c767d99c4e81b715db4e853fc2c8a22702de554a374b27d70c12cd7574a825151081cb4cfcd12dcaee646190df99a2f764fa41b182b0a1051fbbf SHA512 114352b98e5942c3e1d7d2c63bc02d9088e1bb38e76333d680a89fddfa9b869206962d10bcf9304d8d9e4f296f2d38aa1ad20e16c77d2264e736531ca88b1261
-EBUILD qt3d-5.15.1.ebuild 766 BLAKE2B f320edc4f031be1de8461f98ff868fd9b19eb91db48bef7f45cd6d791ac006c68ccc61f6fa6fbc0396143386967210e1b0b613712c65a736f95374212461dd0c SHA512 07fd92c4ec619e542c3bd06b8f4bb764cd08e17d2d2b8cab70c4de8cd65fb02d3870aec8c76324155947f39be02125a317f69cb0ce14d31fc85ca2bd2f75a61b
-MISC metadata.xml 644 BLAKE2B 9d1a63c26345bf489b395cead548565ac4020a7b5d13b88d265ecae24a5dba02ee3529342b8bf461b2bdda34a5265d0d1469cb33d58ded0f2bb7cd548cb2ff7c SHA512 126c840c440e350c85c37143ddbdce3852e7b8eaa73964d650688d7377b251c150a82e7939c4a4c5a696a576dc50bb8edf035cb8c64d17a1536d608943f4193f
+EBUILD qt3d-5.15.1.ebuild 821 BLAKE2B 1ef2dc10bda1cd08afc37e94836a804cf6a73d0a8ebd37e59616d0cf0e81ef3c22af23c2aa8db144b91b869046c8be73bc81fc7ae32b72877968d4a6f6941331 SHA512 e4a03c7d46117ae08bccc74943efaf53a593356875c63d69a7272f1ea9ed4624cdd660665f015508ecc863c549a000fb40d7f0a1791a437187495fb20d0f08f0
+MISC metadata.xml 699 BLAKE2B 45b5458bd903a90a1da6277922d4e0077dbdbede5e4bdfed523d5926abd59147a3085ce007075afe7c50c5256f37d827d3ec6c5287fb7910031198f14c6dbc4e SHA512 c055619fd9c01e39f707dc13bfc5f805b4e3777e3ef0841d1cb52f2fa0f58eafd684a9e911ad7aa8e938f4f42a1cbad205f9cd854c4eaeaa08918db6d64e174b
diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index 5e4a34f313a0..d359595b1800 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<flag name="gamepad">Add support for gamepad hardware via <pkg>dev-qt/qtgamepad</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
+		<flag name="vulkan">Enable support for Vulkan</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qt3d/qt3d-5.14.2.ebuild b/dev-qt/qt3d/qt3d-5.14.2.ebuild
deleted file mode 100644
index 26d5cfdc5fd6..000000000000
--- a/dev-qt/qt3d/qt3d-5.14.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2-only qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qt3d/qt3d-5.15.1.ebuild b/dev-qt/qt3d/qt3d-5.15.1.ebuild
index a9a8e5f27bd1..fe2c864d8f49 100644
--- a/dev-qt/qt3d/qt3d-5.15.1.ebuild
+++ b/dev-qt/qt3d/qt3d-5.15.1.ebuild
@@ -7,22 +7,24 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 # TODO: tools
-IUSE="gamepad gles2-only qml"
+IUSE="gamepad gles2-only qml vulkan"
 
-DEPEND="
+RDEPEND="
 	~dev-qt/qtconcurrent-${PV}
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
+	~dev-qt/qtgui-${PV}:5=[vulkan=]
 	~dev-qt/qtnetwork-${PV}
 	>=media-libs/assimp-4.0.0
 	gamepad? ( ~dev-qt/qtgamepad-${PV} )
 	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
 
 src_prepare() {
 	rm -r src/3rdparty/assimp/{code,contrib,include} || die
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 2f046c5e42cd..7be570012e91 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,5 +1,3 @@
-DIST qtconnectivity-everywhere-src-5.14.2.tar.xz 2804940 BLAKE2B d72e1159877049865d45c5aea8281fce87d797bb41cd82aac534463f48752f8144d018a9a1a23d153adc41b64559c0aa160c00ad1c30ce7790abb11f4ee1d87f SHA512 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a
 DIST qtconnectivity-everywhere-src-5.15.1.tar.xz 2814984 BLAKE2B b1c4e0525fd50af4971d97a4f735e5a9c2fd1bdb72bf2ee01e7136ce57da576d10e4083da7ecd3257471b7a9f7fed3b925b473dcc99ef81a3576fc81abbb7971 SHA512 ad7bad604c466461bcc7bfd889ecbb36e010c89ea1ecf7736f8b0ad49e682a1800cd2507b8d8c0b582c424b176f8179aeec85a6b0fc4ed933f8b6032e935d39a
-EBUILD qtbluetooth-5.14.2-r1.ebuild 637 BLAKE2B 782ff75184a83de5a6ce49eba51ad1320a6b2c87cc23559928231298af2d0299ae8fe98f36b6ed92e034d09b086748cdb806c6c956b2253bae6b573ab6447c9a SHA512 340917ba5f87e627ce70a58287b0777afad3ca0cc4c78dba528fb78a19766eaf5ce6f7b5dc5899f6b790db2385f403395e94633cae9b71423efbf9e2dd2f57b5
-EBUILD qtbluetooth-5.15.1.ebuild 641 BLAKE2B 9727bfd05d1457502a9c8d022e98b61e767e26fa7685e4b22de7f9c42e0b8c519d1984ed91b0c1ff6bd13526cead880b5b962a25c2ed250b522b54d00e28f6a5 SHA512 abe38b529354bafee87b8ee505ab2ac4b84e0e0912e63293e8dab963aa7d95e3d480c2dcf599628bedd39c61103e26a8104af528434ed749e38023c73f0a50aa
+EBUILD qtbluetooth-5.15.1.ebuild 644 BLAKE2B e4f97b2d349fbade9f44e8049fdf093d045c3d9dd61f98169b5b59f60c6ca2cb092c31be9b6b4a9c89fc2a092b53f04028af6fbc3bb83b26cb4cd6a4b0971799 SHA512 3c2e161b7c1b51edd3be8495b72a0135dd47a65920e01534a1c0c3423b7cdd10a27a90713340d7231fc4cf4bf05225192081cffb1518a0d16378addb25dbcb5f
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
deleted file mode 100644
index e9b3e7f2f77b..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtdbus-${PV}
-	>=net-wireless/bluez-5:=
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtnetwork-${PV}
-"
-
-src_prepare() {
-	sed -i -e 's/nfc//' src/src.pro || die
-
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.1.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.1.ebuild
index 5b53f7c84d84..50504a16238b 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.15.1.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Bluetooth support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index e43ffcc03e13..5599dec236d5 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,5 +1,3 @@
-DIST qtcharts-everywhere-src-5.14.2.tar.xz 4250508 BLAKE2B 0f6839bceee19215e82355d66972af69a714e28a75609a0920cee0792e593070fea237e6760b86bda81299ecb9d6bd3561c0a90dafbd571d3a14b72212ddacb0 SHA512 2776db3dfe6f6f1047bd19d8d936d3f72de46c0807bbf02ba874053113d76df4cf80497d5ed2cee192ad94abb8e12b4fbce8359a63d8beb1190d491fc2da35bc
 DIST qtcharts-everywhere-src-5.15.1.tar.xz 4251664 BLAKE2B 392464bfd9fecadf59f759284ff530a5dbeefa0ea31a2ec134538f0abe21ef517be319ab51ff0f0d0a29f68a4c7b3a2c8905484cd193a33626e6381c11880822 SHA512 7e644d4a674f175745646f8b541c8cfd972853fdf3a3ee5d0f7c23f035ae81cef0671292535fe65b1c276e4c54c7a48db1a1d2f9be97834513d154eea1666f3c
-EBUILD qtcharts-5.14.2.ebuild 534 BLAKE2B b808d2c4efa992ceed828eb20a89a4cc890612a7d3470aeb6c38a4e64e27ba9afc0be961998d7c4227bd9c2b2b09f31b5b7ed01273bdc39745a2945fe08deec8 SHA512 a44312ae9fe8012f6c159703e9f76e6ebfe753ca07258466aba8fa73c89840b3200a2d5a02ceefea76d0a7aa9502b97c86034eca78fbbe6e1c9166d7188bf800
-EBUILD qtcharts-5.15.1.ebuild 537 BLAKE2B 596fe8baa9684481dfb85e8d8981fd5d2c87a84629dbc20ca1aea3b646acc4dd0dca87a174f8077001c2b4dfaab8f364053a825cda36d303c9e828e57453e0bf SHA512 ed7901d6735b6099714c199fb7f9aeedef012a4511e0b23abb0be6b457b6af8dd4d8d647945df45f2c2a0e6547f53492283ddb642034998683c1fdfcc6ef5ea3
+EBUILD qtcharts-5.15.1.ebuild 534 BLAKE2B b808d2c4efa992ceed828eb20a89a4cc890612a7d3470aeb6c38a4e64e27ba9afc0be961998d7c4227bd9c2b2b09f31b5b7ed01273bdc39745a2945fe08deec8 SHA512 a44312ae9fe8012f6c159703e9f76e6ebfe753ca07258466aba8fa73c89840b3200a2d5a02ceefea76d0a7aa9502b97c86034eca78fbbe6e1c9166d7188bf800
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtcharts/qtcharts-5.14.2.ebuild b/dev-qt/qtcharts/qtcharts-5.14.2.ebuild
deleted file mode 100644
index 8a4f4e2ff532..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.14.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Chart component library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtcharts/qtcharts-5.15.1.ebuild b/dev-qt/qtcharts/qtcharts-5.15.1.ebuild
index f21ce2b9ce05..8a4f4e2ff532 100644
--- a/dev-qt/qtcharts/qtcharts-5.15.1.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.15.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index be8369c29057..1783e6b2dac0 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtconcurrent-5.14.2.ebuild 440 BLAKE2B 768905eba0008fbbd9612e66009b6f1532c3faebe58c4ab7c5d4d8ffe59b3e7bdd4936e6927e4db5e23e62b8492dfaf5d5d21532feed0471bca9b7cad8b72d3a SHA512 ef6a8da9474323fe742f5d1158f9c72743469fef4492292f34dee6dcd0a2c11bbb8461bb50df61cf0740ae191808c1bcd8952df12a628cfb01ec21d75195a5bf
-EBUILD qtconcurrent-5.15.1.ebuild 446 BLAKE2B 60a97fcbc986abcb826e718545f2b7b71efbe2a7f2d2dac335ee04ac931f345ae3289743fc6102a53ba6a7f090be6545ba1ce826704ee84bdf2d162d8f63ea8d SHA512 4e7205e74298d0cc803b1dbca02489e6bc74be74a8dc7a167fc197165b2a1d9bb2e17c3c03e9dcb0f74656ad3b52695164be670895288d5525646387fb4be354
+EBUILD qtconcurrent-5.15.1.ebuild 440 BLAKE2B 768905eba0008fbbd9612e66009b6f1532c3faebe58c4ab7c5d4d8ffe59b3e7bdd4936e6927e4db5e23e62b8492dfaf5d5d21532feed0471bca9b7cad8b72d3a SHA512 ef6a8da9474323fe742f5d1158f9c72743469fef4492292f34dee6dcd0a2c11bbb8461bb50df61cf0740ae191808c1bcd8952df12a628cfb01ec21d75195a5bf
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
deleted file mode 100644
index 5dc681ed53a2..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
index c484cbcb1761..5dc681ed53a2 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index c5e8e66d6abd..8a1ac6ee3de5 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,7 +1,6 @@
 AUX qtcore-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-AUX qtcore-5.14.2-QLibrary-deadlock.patch 3966 BLAKE2B 79d589005de16dbbe87affa6ce2f9a499fe19f9f6687f85c9ce0d60f95706c22c6261dfab1e414cb6c6ca3f3f8d4ee1f33ad2a01f5ebee8356534d5330629822 SHA512 22d4994cb35869e8eadf158ba8a3f1ec3ca62291c93bfe8f94d6e8a89739bfc4cfc59dfb399be955ba6b00897288224c392d54fcbe24f8246d0f649c2ab22a6a
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
+AUX qtcore-5.15.1-timezone-1.patch 9484 BLAKE2B aa36362fcc6ea1ab144e97dfa1e023e4fbad64f8702e817ee2431ac271aefd637609d14a265c2d6e58bedbdb3f635b4b979c9bf1463a29370ae05bb2610e131b SHA512 1edfe267827225279b0ecad60a5a350b825ed9bd84574d0e5470e71bac75668c0655aa0db2f001e26e331f85e0cf0a68412ba5a9541581bf39a0e954313672b2
+AUX qtcore-5.15.1-timezone-2.patch 1933 BLAKE2B 479f82c90d2132291bc298491d61d7144e08a6db8b36d7d1a89f368c894e41902ae964aaa2819010c485dc5aedd937f2dd00b4efa99d3393d11368e0ea258481 SHA512 c978ffadf15629ab562a53cc24d31e33f4df861962b927ea37061747cb74a7b677d7ae3a617b526c4f48085fe73ebb89fbf5a44748433426dd74e5691a238097
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtcore-5.14.2.ebuild 2242 BLAKE2B b557fb1c41d17ed2924209256334d2844ad19ae06723cc325debe3c148594684b47847e2fa5c3349fb03569d8dc9feddb253fb72f78576adc7cfa11ecf550c4a SHA512 a9e60505ed6de7c96fe52b99f8716883c4e64b6b9ff5a8b66e9ebf2a5f5b99bf5cd66e6750eb5662576d3ec2a4a257a84dccd27bb89b352006a125e7d40d8ac7
-EBUILD qtcore-5.15.1.ebuild 2212 BLAKE2B 4fc9ec710f5d896f867b88ae7ba170740e856c3564acb396030d9ba297660a9bfaef770620d4dd9b2715c7a2252ad8796672a4bf99abfef7a56cd5e017dada9a SHA512 41d63181195ceb2e211c5179473cd0fedf1287b5713b7741afdf8be5a127b14e5e57057e064b693ff9c35047c4118e5d1b77282a68cb67cb11dc6fe0852d1d7d
+EBUILD qtcore-5.15.1-r1.ebuild 2329 BLAKE2B 334f653646aa77c793cfb5de180980e1d2e8d7fde149256de83c944fff0498fb6f323b623bbe1af0028a5a4dfa872c4907c779396b8afce34ba810addd840d60 SHA512 15a004f1ffafe87d13b1bc309b193239891a785e640ee5042262a35b780efdd7ba6ab9201cd346c05f8b46323771174188160f33025a17e61bd22ab1e7f6a643
 MISC metadata.xml 832 BLAKE2B 20f3ca80bc8aea1203ca8c3f34314fb599151eed5639cb9ba6cee97b70a04152ce8c06a4bf1f41058515a3a9d32242bcdf84b6fc75b68b7183951f7c9747396d SHA512 ea1c7dfef8c3afeda436a1de09ee2002441b7d13b3aa40bda02324668f3664fceafcf276f87c897e83f49e246e9fb3ffcefa95098ccb2f5a8b503779686e1b3e
diff --git a/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch b/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch
deleted file mode 100644
index 6a9c9921b7d0..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.14.2-QLibrary-deadlock.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Thu, 2 Apr 2020 12:08:41 -0300
-Subject: [PATCH] QLibrary: fix deadlock caused by fix to QTBUG-39642
-
-Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
-the entire load_sys(). We had reasoed that deadlocks would only occur if
-the object creation in instance() recursed into its own instance(),
-which was already a bug. But we had forgotten that dlopen()/
-LoadLibrary() executes initialization code from the module being loaded,
-which could cause a recursion back into the same QPluginLoader or
-QLibrary object. This recursion is benign because the module *is* loaded
-and dlopen()/LoadLibrary() returns the same handle.
-
-[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
-would happen if the plugin or library being loaded has load-time
-initialization code (C++ global variables) that recursed back into the
-same QLibrary or QPluginLoader object.
-
-PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
-lock, so pluginState should be made an atomic variable. Once that is
-done, we'll only need locking the mutex to update errorString (no
-locking before loading).
-
-Fixes: QTBUG-83207
-Task-number: QTBUG-39642
-Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/corelib/plugin/qlibrary.cpp      | 2 --
- src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
- src/corelib/plugin/qlibrary_win.cpp  | 3 +++
- 3 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
-index ddb053c26fa..be9d92b2048 100644
---- a/src/corelib/plugin/qlibrary.cpp
-+++ b/src/corelib/plugin/qlibrary.cpp
-@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
- 
-     Q_TRACE(QLibraryPrivate_load_entry, fileName);
- 
--    mutex.lock();
-     bool ret = load_sys();
--    mutex.unlock();
-     if (qt_debug_component()) {
-         if (ret) {
-             qDebug() << "loaded library" << fileName;
-diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
-index 017aa97b66a..a5c72f81d96 100644
---- a/src/corelib/plugin/qlibrary_unix.cpp
-+++ b/src/corelib/plugin/qlibrary_unix.cpp
-@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
- 
- bool QLibraryPrivate::load_sys()
- {
-+    QMutexLocker locker(&mutex);
-     QString attempt;
-     QFileSystemEntry fsEntry(fileName);
- 
-@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
-     }
- #endif
- 
-+    locker.unlock();
-     bool retry = true;
-     Handle hnd = nullptr;
-     for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
-@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
-         }
-     }
- #endif
-+
-+    locker.relock();
-     if (!hnd) {
-         errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
-     }
-diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
-index 000bf762763..ef58724be8e 100644
---- a/src/corelib/plugin/qlibrary_win.cpp
-+++ b/src/corelib/plugin/qlibrary_win.cpp
-@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
-     //     fileName
-     //
-     // NB If it's a plugin we do not ever try the ".dll" extension
-+    QMutexLocker locker(&mutex);
-     QStringList attempts;
- 
-     if (pluginState != IsAPlugin)
-@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
-         attempts.prepend(QDir::rootPath() + fileName);
- #endif
- 
-+    locker.unlock();
-     Handle hnd = nullptr;
-     for (const QString &attempt : qAsConst(attempts)) {
- #ifndef Q_OS_WINRT
-@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
- #ifndef Q_OS_WINRT
-     SetErrorMode(oldmode);
- #endif
-+    locker.relock();
-     if (!hnd) {
-         errorString = QLibrary::tr("Cannot load library %1: %2").arg(
-                     QDir::toNativeSeparators(fileName), qt_error_string());
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
new file mode 100644
index 000000000000..1c8f1e89e7d5
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-1.patch
@@ -0,0 +1,271 @@
+From c337f6fae51b987ce7dbed1fd9bea41e6073efbb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 10 Oct 2020 19:26:13 +0200
+Subject: [PATCH 1/2] Revert "Cache system zone ID when fetched from the
+ file-system"
+
+This reverts commit c70ce3d042025c858faffe661f85d2482a2a0d8c.
+---
+ src/corelib/time/qtimezoneprivate_tz.cpp | 205 +++++++----------------
+ 1 file changed, 64 insertions(+), 141 deletions(-)
+
+diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
+index c5c70b7364..01f9a6cce0 100644
+--- a/src/corelib/time/qtimezoneprivate_tz.cpp
++++ b/src/corelib/time/qtimezoneprivate_tz.cpp
+@@ -1,6 +1,5 @@
+ /****************************************************************************
+ **
+-** Copyright (C) 2020 The Qt Company Ltd.
+ ** Copyright (C) 2019 Crimson AS <info@crimson.no>
+ ** Copyright (C) 2013 John Layt <jlayt@kde.org>
+ ** Contact: https://www.qt.io/licensing/
+@@ -43,19 +42,18 @@
+ #include "qtimezoneprivate_p.h"
+ #include "private/qlocale_tools_p.h"
+ 
+-#include <QtCore/QDataStream>
+-#include <QtCore/QDateTime>
+ #include <QtCore/QFile>
+-#include <QtCore/QHash>
+ #include <QtCore/QMutex>
++#include <QtCore/QHash>
++#include <QtCore/QDataStream>
++#include <QtCore/QDateTime>
+ 
+ #include <qdebug.h>
+-#include <qplatformdefs.h>
+ 
+ #include <algorithm>
+ #include <errno.h>
+ #include <limits.h>
+-#ifndef Q_OS_INTEGRITY
++#if !defined(Q_OS_INTEGRITY)
+ #include <sys/param.h> // to use MAXSYMLINKS constant
+ #endif
+ #include <unistd.h>    // to use _SC_SYMLOOP_MAX constant
+@@ -1102,146 +1100,28 @@ QTimeZonePrivate::Data QTzTimeZonePrivate::previousTransition(qint64 beforeMSecs
+     return last > tranCache().cbegin() ? dataForTzTransition(*--last) : invalidData();
+ }
+ 
+-bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
+-{
+-    return tzZones->contains(ianaId);
+-}
+-
+-QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
+-{
+-    QList<QByteArray> result = tzZones->keys();
+-    std::sort(result.begin(), result.end());
+-    return result;
+-}
+-
+-QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
++static long getSymloopMax()
+ {
+-    // TODO AnyCountry
+-    QList<QByteArray> result;
+-    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
+-        if (it.value().country == country)
+-            result << it.key();
+-    }
+-    std::sort(result.begin(), result.end());
+-    return result;
+-}
+-
+-// Getting the system zone's ID:
+-
+-namespace {
+-class ZoneNameReader : public QObject
+-{
+-public:
+-    QByteArray name()
+-    {
+-        /* Assumptions:
+-           a) Systems don't change which of localtime and TZ they use without a
+-              reboot.
+-           b) When they change, they use atomic renames, hence a new device and
+-              inode for the new file.
+-           c) If we change which *name* is used for a zone, while referencing
+-              the same final zoneinfo file, we don't care about the change of
+-              name (e.g. if Europe/Oslo and Europe/Berlin are both symlinks to
+-              the same CET file, continuing to use the old name, after
+-              /etc/localtime changes which of the two it points to, is
+-              harmless).
+-
+-           The alternative would be to use a file-system watcher, but they are a
+-           scarce resource.
+-         */
+-        const StatIdent local = identify("/etc/localtime");
+-        const StatIdent tz = identify("/etc/TZ");
+-        if (!m_name.isEmpty() && m_last.isValid() && (m_last == local || m_last == tz))
+-            return m_name;
+-
+-        m_name = etcLocalTime();
+-        if (!m_name.isEmpty()) {
+-            m_last = local;
+-            return m_name;
+-        }
+-
+-        m_name = etcTZ();
+-        m_last = m_name.isEmpty() ? StatIdent() : tz;
+-        return m_name;
+-    }
+-
+-
+-private:
+-    QByteArray m_name;
+-    struct StatIdent
+-    {
+-        static constexpr unsigned long bad = ~0ul;
+-        unsigned long m_dev, m_ino;
+-        StatIdent() : m_dev(bad), m_ino(bad) {}
+-        StatIdent(const QT_STATBUF &data) : m_dev(data.st_dev), m_ino(data.st_ino) {}
+-        bool isValid() { return m_dev != bad || m_ino != bad; }
+-        bool operator==(const StatIdent &other)
+-        { return other.m_dev == m_dev && other.m_ino == m_ino; }
+-    };
+-    StatIdent m_last;
+-
+-    static StatIdent identify(const char *path)
+-    {
+-        QT_STATBUF data;
+-        return QT_STAT(path, &data) == -1 ? StatIdent() : StatIdent(data);
+-    }
+-
+-    static QByteArray etcLocalTime()
+-    {
+-        // On most distros /etc/localtime is a symlink to a real file so extract
+-        // name from the path
+-        const QLatin1String zoneinfo("/zoneinfo/");
+-        QString path = QStringLiteral("/etc/localtime");
+-        long iteration = getSymloopMax();
+-        // Symlink may point to another symlink etc. before being under zoneinfo/
+-        // We stop on the first path under /zoneinfo/, even if it is itself a
+-        // symlink, like America/Montreal pointing to America/Toronto
+-        do {
+-            path = QFile::symLinkTarget(path);
+-            int index = path.indexOf(zoneinfo);
+-            if (index >= 0) // Found zoneinfo file; extract zone name from path:
+-                return path.midRef(index + zoneinfo.size()).toUtf8();
+-        } while (!path.isEmpty() && --iteration > 0);
+-
+-        return QByteArray();
+-    }
+-
+-    static QByteArray etcTZ()
+-    {
+-        // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
+-        const QString path = QStringLiteral("/etc/TZ");
+-        QFile zone(path);
+-        if (zone.open(QIODevice::ReadOnly))
+-            return zone.readAll().trimmed();
+-
+-        return QByteArray();
+-    }
+-
+-    // Any chain of symlinks longer than this is assumed to be a loop:
+-    static long getSymloopMax()
+-    {
+-#ifdef SYMLOOP_MAX
+-        // If defined, at runtime it can only be greater than this, so this is a safe bet:
+-        return SYMLOOP_MAX;
++#if defined(SYMLOOP_MAX)
++    return SYMLOOP_MAX; // if defined, at runtime it can only be greater than this, so this is a safe bet
+ #else
+-        errno = 0;
+-        long result = sysconf(_SC_SYMLOOP_MAX);
+-        if (result >= 0)
+-            return result;
+-        // result is -1, meaning either error or no limit
+-        Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
+-
+-        // therefore we can make up our own limit
+-#  ifdef MAXSYMLINKS
+-        return MAXSYMLINKS;
++    errno = 0;
++    long result = sysconf(_SC_SYMLOOP_MAX);
++    if (result >= 0)
++        return result;
++    // result is -1, meaning either error or no limit
++    Q_ASSERT(!errno); // ... but it can't be an error, POSIX mandates _SC_SYMLOOP_MAX
++
++    // therefore we can make up our own limit
++#  if defined(MAXSYMLINKS)
++    return MAXSYMLINKS;
+ #  else
+-        return 8;
++    return 8;
+ #  endif
+ #endif
+-    }
+-};
+ }
+ 
++// TODO Could cache the value and monitor the required files for any changes
+ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+ {
+     // Check TZ env var first, if not populated try find it
+@@ -1256,9 +1136,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+     else if (ianaId.startsWith(':'))
+         ianaId = ianaId.mid(1);
+ 
++    // On most distros /etc/localtime is a symlink to a real file so extract name from the path
++    if (ianaId.isEmpty()) {
++        const QLatin1String zoneinfo("/zoneinfo/");
++        QString path = QFile::symLinkTarget(QStringLiteral("/etc/localtime"));
++        int index = -1;
++        long iteration = getSymloopMax();
++        // Symlink may point to another symlink etc. before being under zoneinfo/
++        // We stop on the first path under /zoneinfo/, even if it is itself a
++        // symlink, like America/Montreal pointing to America/Toronto
++        while (iteration-- > 0 && !path.isEmpty() && (index = path.indexOf(zoneinfo)) < 0)
++            path = QFile::symLinkTarget(path);
++        if (index >= 0) {
++            // /etc/localtime is a symlink to the current TZ file, so extract from path
++            ianaId = path.midRef(index + zoneinfo.size()).toUtf8();
++        }
++    }
++
++    // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
+     if (ianaId.isEmpty()) {
+-        thread_local static ZoneNameReader reader;
+-        ianaId = reader.name();
++        QFile zone(QStringLiteral("/etc/TZ"));
++        if (zone.open(QIODevice::ReadOnly))
++            ianaId = zone.readAll().trimmed();
+     }
+ 
+     // Give up for now and return UTC
+@@ -1268,4 +1167,28 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+     return ianaId;
+ }
+ 
++bool QTzTimeZonePrivate::isTimeZoneIdAvailable(const QByteArray &ianaId) const
++{
++    return tzZones->contains(ianaId);
++}
++
++QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds() const
++{
++    QList<QByteArray> result = tzZones->keys();
++    std::sort(result.begin(), result.end());
++    return result;
++}
++
++QList<QByteArray> QTzTimeZonePrivate::availableTimeZoneIds(QLocale::Country country) const
++{
++    // TODO AnyCountry
++    QList<QByteArray> result;
++    for (auto it = tzZones->cbegin(), end = tzZones->cend(); it != end; ++it) {
++        if (it.value().country == country)
++            result << it.key();
++    }
++    std::sort(result.begin(), result.end());
++    return result;
++}
++
+ QT_END_NAMESPACE
+-- 
+2.28.0
+
diff --git a/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
new file mode 100644
index 000000000000..611c979a469c
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.15.1-timezone-2.patch
@@ -0,0 +1,47 @@
+From ffc9093a199a542791920b30d1835c3248920aa0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
+Date: Sat, 10 Oct 2020 19:26:35 +0200
+Subject: [PATCH 2/2] Revert "Purge two old time-zone lookup fallbacks"
+
+This reverts commit b0383cbd388336f698ceeac11a4f50cdff931dd9.
+---
+ src/corelib/time/qtimezoneprivate_tz.cpp | 23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
+index 01f9a6cce0..eea6f5e962 100644
+--- a/src/corelib/time/qtimezoneprivate_tz.cpp
++++ b/src/corelib/time/qtimezoneprivate_tz.cpp
+@@ -1153,6 +1153,29 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const
+         }
+     }
+ 
++    // On Debian Etch up to Jessie, /etc/localtime is a copy of the relevant
++    // zoneinfo file, whose name is recorded in /etc/timezone:
++    if (ianaId.isEmpty()) {
++        QFile tzif(QStringLiteral("/etc/timezone"));
++        if (tzif.open(QIODevice::ReadOnly))
++            ianaId = tzif.readAll().trimmed();
++    }
++
++    // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
++    // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
++    if (ianaId.isEmpty()) {
++        QFile tzif(QStringLiteral("/etc/sysconfig/clock"));
++        if (tzif.open(QIODevice::ReadOnly)) {
++            while (ianaId.isEmpty() && !tzif.atEnd()) {
++                const QByteArray line(tzif.readLine().trimmed());
++                if (line.startsWith("ZONE="))
++                    ianaId = line.mid(6, line.length() - 7);
++                else if (line.startsWith("TIMEZONE="))
++                    ianaId = line.mid(10, line.length() - 11);
++            }
++        }
++    }
++
+     // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
+     if (ianaId.isEmpty()) {
+         QFile zone(QStringLiteral("/etc/TZ"));
+-- 
+2.28.0
+
diff --git a/dev-qt/qtcore/qtcore-5.14.2.ebuild b/dev-qt/qtcore/qtcore-5.14.2.ebuild
deleted file mode 100644
index 48df292f53b7..000000000000
--- a/dev-qt/qtcore/qtcore-5.14.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/$(ver_cut 1-3)
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtcore-4.8.7-r4:4
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-	"${FILESDIR}/${P}-QLibrary-deadlock.patch" # QTBUG-83207
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 3 17 && ! use old-kernel; then
-		ewarn "The running kernel is older than 3.17. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. See Bug #669994."
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		-no-feature-statx	# bug 672856
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtcore/qtcore-5.15.1.ebuild b/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
index 449fddfc065d..d893c6ff73df 100644
--- a/dev-qt/qtcore/qtcore-5.15.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Cross-platform application development framework"
 SLOT=5/$(ver_cut 1-3)
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="icu old-kernel systemd"
@@ -44,7 +44,11 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 	!:xml
 )
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" ) # bug 703306
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch"  # bug 703306
+	"${FILESDIR}/${PN}-5.15.1-timezone-1.patch"                   # bug 737914
+	"${FILESDIR}/${PN}-5.15.1-timezone-2.patch"
+)
 
 pkg_pretend() {
 	use kernel_linux || return
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 0fda4af6fc6b..7f99dc59601c 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,3 @@
-DIST qtdatavis3d-everywhere-src-5.14.2.tar.xz 5190800 BLAKE2B 2e60bb97526bfac4c9bd70aae8885fc5f9b7704f8dbe8cff726ef6a60d83507f4d9c59a92b45a3fce78c21ed6d7e41466acec00910e96921a73b5d9bc9fa130d SHA512 25d207e045e58f9edc3a661b641225f6a11eb45f723847281007fa53b753430dc5792e31bdd142c95e886bfda5f6d29826cd151cb23a1e1a81cc0b91d5f7a2f6
 DIST qtdatavis3d-everywhere-src-5.15.1.tar.xz 5191624 BLAKE2B ac6f6591f12e00bd9e473da0441d6863b1ffc44d125998a530a3993e9489ee56ed5c9d30e9842fc2b4a4b22110a0296709834582025d50c34653f90be5f08393 SHA512 3f11cddebd29aa90ce62fa19f9ab33026393bf95525bea7c4514e04acef23db9dbfdf000aa885aa2f823b1cd6ca99ac2a1f8afaabe67ee13785d5e4650aa4c97
-EBUILD qtdatavis3d-5.14.2.ebuild 641 BLAKE2B 40c28d84c475f1d5bdc2f269d8377251b1db88865f03d36b992d4b954287854820e18300902a0afe39c17a817c9849fae069b6bc939f35dcb7610d6282a227d9 SHA512 09879a304e88c156d30c218fe86b1b552c0cf2b1e2bdba7450120c0060b559fc8e31c2c642dcd706d39209b3e468073afba7db8ce23ef0e9db2bf30c64aa5db8
-EBUILD qtdatavis3d-5.15.1.ebuild 644 BLAKE2B 264e461ddd6f60b2189b9d5b397f27fa02f90e716a1dec85c7448edfdba03b554f5e9f9dd220f86aa436687463aeaef47719b3c00ca4a814dad3a9132b5ac114 SHA512 91f8194351b5719c429ff819a81f6b8ae070591b710451f6022ad71f6d6a115480d4f6d0d5d9631c2aedc8215de2884f580e6c22b3409c1debe478bf49cc52e6
+EBUILD qtdatavis3d-5.15.1.ebuild 641 BLAKE2B 40c28d84c475f1d5bdc2f269d8377251b1db88865f03d36b992d4b954287854820e18300902a0afe39c17a817c9849fae069b6bc939f35dcb7610d6282a227d9 SHA512 09879a304e88c156d30c218fe86b1b552c0cf2b1e2bdba7450120c0060b559fc8e31c2c642dcd706d39209b3e468073afba7db8ce23ef0e9db2bf30c64aa5db8
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
deleted file mode 100644
index b14bfaf7cb43..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-IUSE="gles2-only qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild
index 8cee1109659b..b14bfaf7cb43 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.15.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 IUSE="gles2-only qml"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 8342235e6ae9..94a9a48b90d9 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtdbus-5.14.2.ebuild 684 BLAKE2B faf088083550c090c5d2348442f272870d7f82ffec6f7f8f2988e9fbc21d81825df4b0a2db4bb6c44404b38671f6933e038251f9076bc7e82509dc6cf8fa0f24 SHA512 5ec14c86fc61b3d1031681e7655c18301727fcbec1d9f19a6e6a4321d122e456425eb17de9ece5adb0804cf8df51df0ff4b2fbca8a6d3dec10c665807217c824
-EBUILD qtdbus-5.15.1.ebuild 690 BLAKE2B c05fa4051750c9007e616f8cce01b32d0b1061bada85b5a90a2f146db7a0cb904e1d9f5aeeea8a15dea05f09a05cbcf48758f288ffaedcb47195cc533911926b SHA512 dcabbe196e3a3401e0c7aa998934a3cb819e69ece7706709bdf8c9dc8aa6c10c76d0c28e249b41f4df3265d8263f72e1c18ca98a95ff133c36a112e8fd4128ac
+EBUILD qtdbus-5.15.1.ebuild 684 BLAKE2B faf088083550c090c5d2348442f272870d7f82ffec6f7f8f2988e9fbc21d81825df4b0a2db4bb6c44404b38671f6933e038251f9076bc7e82509dc6cf8fa0f24 SHA512 5ec14c86fc61b3d1031681e7655c18301727fcbec1d9f19a6e6a4321d122e456425eb17de9ece5adb0804cf8df51df0ff4b2fbca8a6d3dec10c665807217c824
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild b/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
deleted file mode 100644
index f0425f0dc006..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	>=sys-apps/dbus-1.4.20
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/dbus
-	src/tools/qdbusxml2cpp
-	src/tools/qdbuscpp2xml
-)
-
-QT5_GENTOO_CONFIG=(
-	:dbus
-	:dbus-linked:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:dbus
-	:dbus-linked
-)
-
-src_configure() {
-	local myconf=(
-		-dbus-linked
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild b/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
index 098360958680..f0425f0dc006 100644
--- a/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 0093a69440d1..6aff20287627 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,9 +1,5 @@
 AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3
-AUX qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch 2326 BLAKE2B 5e611e7f2700743deee7d930fff129f525af54c2e3d6e53dd84a50c989e30046f970989f01a60379473e6626c8f4e0c99a6c4b645a986133ea519e944d173168 SHA512 6b6155fd82edd8d20e2e43b3f9c9294d091ef011b49024994a5a6b78fb536e632f923a981859013969b7d1cbdb86a16bec9f9e3f0f8db26cc4f24847ec6c338e
-AUX qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch 3141 BLAKE2B 98aa28237d08909005267ff585b8112f1349f9f14e71bf505b84abbc38bc77fc1fb7c5a4588ff173df71223bfb842aed44283ac153b19f5cc6967fa4a3c275e4 SHA512 245097ed63bfe8f1cf3c4ec82a30757131a76b7ac9c47251044ca44822a2dbd8c5958f87cbc78f0196a67498f0cbbe03b7c15519fc55136e7ccb6f181a342b5f
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
-DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
 DIST qtdeclarative-everywhere-src-5.15.1.tar.xz 21558724 BLAKE2B 15da5471799e461e5f5983fb0d947cad9d635a1bb0760da0b709f273ba9a9846df442f424d2009e857d831695d14a92c9be941270a07dc0f33cc46382ba44e6f SHA512 193ec706b764330a2ae00614b13482b7586642f9cfd32458e8c975daa07ba25f0f9887de0918c4034f52f613b860677c09c46a3b7d07d4229446cfc0805bcccd
-EBUILD qtdeclarative-5.14.2-r4.ebuild 1420 BLAKE2B 68e9ad656186ac04da20d3f58428c93a8acf8a1282e1cce360d9807775ff1ae88f41d465af1787069d9399b072d85037c0d8d48699a768f36f1557548020fd6f SHA512 f3d46152bcd7443c308899d5c09b6374b67a6486060c0b37d395efbd3eaba2914daad2f46b25f3f32d4920731767358e00ce1afcb82117015c4f2fedf63e3ee5
-EBUILD qtdeclarative-5.15.1.ebuild 1286 BLAKE2B 0f2c83d2a4c097f9be3f2648806f7b6abee9ff0f5255f344f875e89037f079f22292c3f487c792848d4b69f411ab48e5d73628f862f3728f34f7f95598ff2227 SHA512 9d8458473f79e7a58739b115e854a62904d4557d23c8be5f8fd80e3e9061d1aaee5146f074bc05c6c4921adcecb5377e972d14f1ba0d62aa803fad2b433618b5
+EBUILD qtdeclarative-5.15.1.ebuild 1280 BLAKE2B 87beb6e2d2b9f39a8288930b7d13f5602cf8df6b74db037cbd03c336613496baffbc27899d93ff9671ad5bc95dc72bfe9725b44d68ed17ccc816dceec476cfca SHA512 7e3c5e12364f6e0c3110ad6039080fbc1b88a0285997eeecaae2dafbf73bff2791a5eb41c880b323e25f10cb5f7a91f014dc89e240636dc835d6e78822bb414a
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch
deleted file mode 100644
index 1dd0ff1155de..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-QQuickMouseArea-stuck-in-pressed-state.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8ace780b5aa298e3c01903bfd57f766a42209191 Mon Sep 17 00:00:00 2001
-From: Frederik Gladhorn <frederik.gladhorn@remarkable.com>
-Date: Sat, 28 Mar 2020 15:14:41 +0100
-Subject: [PATCH] Fix QQuickMouseArea getting stuck in pressed state when
- hiding in press
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-In 78c1fcbc49f56463064eef738a475d9018357b24 we stopped giving the
-exclusive grab to hidden or disabled items with is good. But the change
-did not take into consideration how mouse area handles its internal
-state.
-
-As a simple example: A mouse area that would set itself hiddin in the
-press handler, would continue to have d->pressed == true, which means it
-would not react to any future press events.
-
-The fix is to let mouse area check in its change handler whether it has
-become invisible.
-The test also checks that enabled behaves the same way. There is no
-action needed, since mouse area does completely custom handling of
-enabled (maybe something to fix in Qt 6), disabling a mouse area doesn't
-disable its children for example, it doesn't invoke
-QQuickItem::setEnabled at all. Due to this circumventing the common
-behavior, by chance disabling a mouse area in the on pressed handler
-works.
-
-Fixes: QTBUG-74987
-Change-Id: Idb8499b3e5bcb744fbba203fdea5c46695bd5077
-Reviewed-by: Jan Arve SÃ¦ther <jan-arve.saether@qt.io>
----
- src/quick/items/qquickmousearea.cpp                |  6 ++++
- 3 files changed, 80 insertions(+)
- create mode 100644 tests/auto/quick/qquickmousearea/data/settingHiddenInPressUngrabs.qml
-
-diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
-index 368379f5c40..dc60712a9cd 100644
---- a/src/quick/items/qquickmousearea.cpp
-+++ b/src/quick/items/qquickmousearea.cpp
-@@ -1083,6 +1083,12 @@ void QQuickMouseArea::itemChange(ItemChange change, const ItemChangeData &value)
-             }
-             setHovered(!d->hovered);
-         }
-+        if (d->pressed && (!isVisible())) {
-+            // This happens when the mouse area sets itself disabled or hidden
-+            // inside the press handler. In that case we should not keep the internal
-+            // state as pressed, since we never became the mouse grabber.
-+            ungrabMouse();
-+        }
-         break;
-     default:
-         break;
--- 
-2.16.3
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
deleted file mode 100644
index 23eaa7d5100d..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.14.2-fix-subpixel-positioned-text.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From e807f9d1d80559b8ff91f1c3cfdd755b3da56a6d Mon Sep 17 00:00:00 2001
-From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-Date: Tue, 5 May 2020 11:36:24 +0200
-Subject: [PATCH] Fix subpixel positioned text with Text.NativeRendering
-
-We would be generating subpixel positioned glyphs based on the
-relative positions of the glyphs, ignoring the fractional part
-contributed by the origin of the text. So if the text origin was
-inside a pixel, the subpixel antialiasing would be wrong and we
-would see kerning errors.
-
-This was especially visible when using AlignHCenter on text
-with hinting disabled and resizing the item it was aligning to.
-
-Pick-to: 5.15
-Task-number: QTBUG-49646
-Change-Id: I0e709ba2b5d2440e34c94c6f819befe0a65a113a
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
----
- src/quick/scenegraph/qsgdefaultglyphnode_p.cpp | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
-index cfa645bfd03..f73b64f537f 100644
---- a/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
-+++ b/src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
-@@ -789,11 +789,12 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
-                                    const QMargins &margins)
- {
-     Q_ASSERT(m_font.isValid());
-+    QPointF position(p.x(), p.y() - m_font.ascent());
-     QVector<QFixedPoint> fixedPointPositions;
-     const int glyphPositionsSize = glyphPositions.size();
-     fixedPointPositions.reserve(glyphPositionsSize);
-     for (int i=0; i < glyphPositionsSize; ++i)
--        fixedPointPositions.append(QFixedPoint::fromPointF(glyphPositions.at(i)));
-+        fixedPointPositions.append(QFixedPoint::fromPointF(position + glyphPositions.at(i)));
- 
-     QTextureGlyphCache *cache = glyphCache();
- 
-@@ -815,18 +816,16 @@ void QSGTextMaskMaterial::populate(const QPointF &p,
-     Q_ASSERT(geometry->sizeOfVertex() == sizeof(QVector4D));
-     ushort *ip = geometry->indexDataAsUShort();
- 
--    QPointF position(p.x(), p.y() - m_font.ascent());
-     bool supportsSubPixelPositions = fontD->fontEngine->supportsSubPixelPositions();
-     for (int i=0; i<glyphIndexes.size(); ++i) {
-+         QPointF glyphPosition = glyphPositions.at(i) + position;
-          QFixed subPixelPosition;
-          if (supportsSubPixelPositions)
--             subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPositions.at(i).x()));
-+             subPixelPosition = fontD->fontEngine->subPixelPositionForX(QFixed::fromReal(glyphPosition.x()));
- 
-          QTextureGlyphCache::GlyphAndSubPixelPosition glyph(glyphIndexes.at(i), subPixelPosition);
-          const QTextureGlyphCache::Coord &c = cache->coords.value(glyph);
- 
--         QPointF glyphPosition = glyphPositions.at(i) + position;
--
-          // On a retina screen the glyph positions are not pre-scaled (as opposed to
-          // eg. the raster paint engine). To ensure that we get the same behavior as
-          // the raster engine (and CoreText itself) when it comes to rounding of the
--- 
-2.16.3
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
deleted file mode 100644
index ee5e2c5a785e..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2009-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="gles2-only +jit localstorage vulkan +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}:5=[gles2-only=,vulkan=]
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qttest-${PV}
-	localstorage? ( ~dev-qt/qtsql-${PV} )
-	widgets? ( ~dev-qt/qtwidgets-${PV}[gles2-only=] )
-"
-RDEPEND="${DEPEND}
-	!<dev-qt/qtquickcontrols-5.7:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890
-	"${FILESDIR}/${P}-fix-subpixel-positioned-text.patch" # QTBUG-49646
-	"${FILESDIR}/${P}-QQuickMouseArea-stuck-in-pressed-state.patch" # QTBUG-74987
-)
-
-src_prepare() {
-	use jit || PATCHES+=("${FILESDIR}/${PN}-5.4.2-disable-jit.patch")
-
-	qt_use_disable_mod localstorage sql \
-		src/imports/imports.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/qmltest/qmltest.pro \
-		tests/auto/auto.pro \
-		tools/tools.pro \
-		tools/qmlscene/qmlscene.pro \
-		tools/qml/qml.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		-qml-debug
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild
index a2d185e8305f..4d0bd69acb5e 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="gles2-only +jit localstorage vulkan +widgets"
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 0d9d10382b24..89abb2d769ac 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD qtdiag-5.14.2.ebuild 724 BLAKE2B 128c01ccaf9640cad1077304f53db97b6f9b5f97ad41a559075a6e1b589b93218d4101a6f528c09bb63a11902269874a5ad1e50c340823fc96393f82b74e392e SHA512 058a00ad204642694bc0091edc1af6da105c48e96dcd2c2698bfdbd55831afedeb694559bf2e9e1015b303a0d61d03decb4a95ded6f872bc1727c31175bfd0e9
-EBUILD qtdiag-5.15.1.ebuild 787 BLAKE2B c1544d1b612bfd152816b77cf8ae3dbf3631b0b02727d7751d885a1b9f8a723e07200c99cccf11c1e9032552421b2cb5c98da5f8cbee32e5e6d71b39dfeaa2cf SHA512 f3a66c530988b6d80c815301e0fd4d9edd202aff388b243f0afecfcbdcaa502f9bbe3b6e7022bb23235204eee271f2973abd6d7fd9d48bbce55eba8624b3e80f
+EBUILD qtdiag-5.15.1.ebuild 785 BLAKE2B 342d523601361c57f785ed82b98cb4f844b865683f9f92b296ad2949832616c33f91ddd0d2f32f1d700ae74eb3e957fa82eedce4d559a18a29bd654361350f73 SHA512 d915a590dc1e195e7803454d10a66599a93169251212e91e081130c0be73b5f671527facd29939e1a33c4ac6aa290c02c429c500e737c4006e7be7cb73a2ffbf
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.14.2.ebuild b/dev-qt/qtdiag/qtdiag-5.14.2.ebuild
deleted file mode 100644
index cdbb37ad3e68..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.14.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}:5=
-	network? ( ~dev-qt/qtnetwork-${PV}[ssl] )
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtdiag
-)
-
-src_prepare() {
-	qt_use_disable_mod network network \
-		src/qtdiag/qtdiag.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/qtdiag/qtdiag.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdiag/qtdiag-5.15.1.ebuild b/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
index 3a64cd887589..edfbbd07b52f 100644
--- a/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~sparc x86"
 fi
 
 IUSE="+network +widgets"
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index 15aacd3317e1..0f35a2f41f82 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,5 +1,3 @@
-DIST qtgamepad-everywhere-src-5.14.2.tar.xz 386940 BLAKE2B e1f9312f5007eea0f8126bd1145be603958a6e0833e74f2fe116595d7afa07ba7868d4dce91281440755ce7ff98445bdb38fc09e54ef35ec57dd156fadcaf23e SHA512 23971fae9b1626afc005dccae3bb715f719695bf5e24a1711b3e7049ce49ef5c72097e1eb702464ab7663d41750bf4103e4ed78ee7954269921e3064b79f4c05
 DIST qtgamepad-everywhere-src-5.15.1.tar.xz 387004 BLAKE2B 26e7e766121b18851f28c514e4cb7c144f1cce506ef80dc9db4034639df0c77671b5be618d318bb20c8aba290f1a3ed1d99d3a23fac83bc0942063d2cb4f77c2 SHA512 f74933f9e28d0db03d30743e7d75c7a1ba28fa03d97aa894b5cbc306a2d501c27ec40eb84c6b999a6e5ed01b3126bfa992a3a3ca28246310edfe1f2fc12c1d88
-EBUILD qtgamepad-5.14.2.ebuild 694 BLAKE2B 17a6b38d5367c57d8faf74e3bb43ac5e80728768aec2ec4c51a8919b1ad11feeadb4661d7ddba333836268523d73e745ce79340f093d4671f40d5c6d73f69fee SHA512 6128236aa0d1c1b1f694462fc988b0bff32e4de2a2f2ad1a535ed10a5fb73715bb198d14e6c7ae41ada6765eb1bd99a70aa9ceff8c8065495138ee43dbc0663e
-EBUILD qtgamepad-5.15.1.ebuild 697 BLAKE2B 35555963e3f832804d39b26d98c0b7a0dc3717fdb32b911d2f712051145710a3a7416dcbde96c20e2d60e6f39b08d930ca38db5bc85497fe03aa24ec269ce365 SHA512 a2e7934fc22b64a6a72688c6e5410cfa854b2a1b539e2401cf55cd464ac5fbaf5e44a403a4270888e94689dcba792edb600736599ddb6532aecb51e288dab456
+EBUILD qtgamepad-5.15.1.ebuild 694 BLAKE2B 17a6b38d5367c57d8faf74e3bb43ac5e80728768aec2ec4c51a8919b1ad11feeadb4661d7ddba333836268523d73e745ce79340f093d4671f40d5c6d73f69fee SHA512 6128236aa0d1c1b1f694462fc988b0bff32e4de2a2f2ad1a535ed10a5fb73715bb198d14e6c7ae41ada6765eb1bd99a70aa9ceff8c8065495138ee43dbc0663e
 MISC metadata.xml 612 BLAKE2B 9f8eb8c418b79633ebe1df1ba6423de74232787ae4eadea6fb217657fc2dd3ece81e73294ba21f2c0c57596a43e918a812670a5dda271dd7f2721ea0600445b5 SHA512 8593354f9a345ddaedcf0f962877ee7b40db413123226804ef5ea3664c98cc14d7d7f60d63911166e06e3e4fe5b907b1e2ae7a3dc4df527a975f92051b504f8c
diff --git a/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild
deleted file mode 100644
index 5354d14f6fb0..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.14.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module to support gamepad hardware"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-IUSE="evdev qml sdl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[evdev?]
-	evdev? ( virtual/libudev:= )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-	sdl? ( media-libs/libsdl )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt_use_disable_config evdev evdev \
-		src/plugins/gamepads/gamepads.pro
-
-	qt_use_disable_config sdl sdl2 \
-		src/plugins/gamepads/gamepads.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgamepad/qtgamepad-5.15.1.ebuild b/dev-qt/qtgamepad/qtgamepad-5.15.1.ebuild
index afe615251d28..5354d14f6fb0 100644
--- a/dev-qt/qtgamepad/qtgamepad-5.15.1.ebuild
+++ b/dev-qt/qtgamepad/qtgamepad-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt module to support gamepad hardware"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 IUSE="evdev qml sdl"
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index e2befb7648ea..99b43fcc3914 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,5 +1,3 @@
-DIST qtgraphicaleffects-everywhere-src-5.14.2.tar.xz 14040880 BLAKE2B 7fe0d534b9365e02c6a9499a7d0ef5d2e87a9c46819f05ad5052a23400bf90070b6ec9e7aad8a76de63760bea7853c29a1e01eb055956588f46347525a86f2e1 SHA512 fa6ed3eff243675f9d0bfa71b2886804e4902cf9d7d91d5dec0f8e4f060ee7c347ba7775a89e3f8effd0ffed8314f916b55f09056902abc892ee27e79ce2925c
 DIST qtgraphicaleffects-everywhere-src-5.15.1.tar.xz 14040940 BLAKE2B 1e49e58efeedadccb76c680ef80b017fbf5ff62df25140e0ef7012caacab0db67307f1a6ffd0cfe28e76b67ace61c858b1e34994c700b2a533233b9659efb970 SHA512 651f8d96199b6324726fcf97eebf16a3ee40e5a9523a3c03255ca4201228b8d02314d5dd9722f59d44f09b4ff8dd722fb276b9af7f65728693a2c4ee62f781c1
-EBUILD qtgraphicaleffects-5.14.2.ebuild 443 BLAKE2B 1283105c3a8c25d7e23c3b97778325c65ada123fc0f4eb1cc2a033f084419049a628adb8511aa0d3e5d437597c2c6c8e601824241aa993466a100113e9a74e73 SHA512 53190cf51f5f0217831220c64d4c4a6e9c6015c26692dce8c8a7950ccb6e775c28e1ec7b2a9609080726a37cb4cbcad9af17457ac51ec42866975e7beff246c6
-EBUILD qtgraphicaleffects-5.15.1.ebuild 448 BLAKE2B 2e379ebce1e569228f5f82004779c0f6cb1008b239558dddfc192a09d2320f53574651c862cac214a84f3ceb6a2519d6c6d29a46fc425701d2d0f4bbeec3cd5d SHA512 caf74fee9a7ed9454daf1645d43ecd59ced44f43e6856f2b819f84a3025d4d5549021088beb346af36f3f3786e1263a8dceb30643f5aaa991b19944ee2b398cb
+EBUILD qtgraphicaleffects-5.15.1.ebuild 443 BLAKE2B 1283105c3a8c25d7e23c3b97778325c65ada123fc0f4eb1cc2a033f084419049a628adb8511aa0d3e5d437597c2c6c8e601824241aa993466a100113e9a74e73 SHA512 53190cf51f5f0217831220c64d4c4a6e9c6015c26692dce8c8a7950ccb6e775c28e1ec7b2a9609080726a37cb4cbcad9af17457ac51ec42866975e7beff246c6
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
deleted file mode 100644
index f778c7d5a49a..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
index ec75dc760768..f778c7d5a49a 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 167c7fe3a89d..70fa66439c04 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,8 +1,6 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-AUX qtgui-5.14.2-CVE-2020-17507.patch 1582 BLAKE2B 6fde9d057c96e65159ba1c07a7fa2df6d9ed5577810eb149667168b0a7c2fd754ae49c153a2c5486ad04768338edd791803d0ebc92955e8db5015d7cc9f72a7c SHA512 159eb0eebd650bc5fe33e3e7555ce7a1d39d3294aaf5d47c2db4f437fb9c15b7ceed1566b4354b26f19b6c5ab10f5c748407c5a31077326018aafb238b167a43
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
+AUX qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch 3517 BLAKE2B 5f65f37420688f9c467ae9a1190cd8774edce8aaa4a4272c173d11bd801f698a667459dae8289f36529e414d36013d40b1e82752a09ee2ad8d28bf0a648bec68 SHA512 46acde292a9654f92ad603d0d0083517c8187708131166292c950f8acc73702762e0dc8a037937c6f902598636cdf320f645f2c0ebc546d095df7bd89419f9be
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtgui-5.14.2-r1.ebuild 4047 BLAKE2B 56a431c5987ecae329508484bab74f2dbaaff31eeb81ea0d33abc49364854244d2dd084d53c89503b54b6960b09a3b398a5908dbff34c1154e848fa9980dc65e SHA512 bce682f3763eedad5f22ffbb894887f70a53b76f25286eb1fb9053ad18a5efe96da98a10c54a80312d2f0516149455fa09db8ec1e4cf5cadb98f59b5ccad8b06
-EBUILD qtgui-5.15.1.ebuild 3984 BLAKE2B f72109d2fcb1a813afb4214cdbfe19c927d877fdc9c4d0dbda4e9865d66f54c2e6fac942bfddf3687d329198b5376e3d1ceb5d10150bec707630e93c5e2eff45 SHA512 39881a7ba7fcbcb8578c36d1bce81a6e25f2d99d2f2609ae8f5e20a429e9a74d5b47d5a84db7c062b0c83125d9b72de553d8c9b9d05e562c7b77920c16bc728f
+EBUILD qtgui-5.15.1-r1.ebuild 4064 BLAKE2B 0d3a6a6be5b202b2005e15d24073d848d4c9754870dbf5e64bc691ab1b8a36b0151f2247a861be53379b9e1483b727d60a75eac7bd953fc486445044655eb777 SHA512 91455d767974c80878e34d2f53a2a45d88499dabbb69bf2365da8d31b963991bba5c32db96c11b357ecf6ec1a1115f1c109a4d08530941b43a4325e03aaa72e4
 MISC metadata.xml 1302 BLAKE2B 898227fe66d379fb08154a190b9eec68d98e452cf412ee56ccb9a879511d27ab44cdac45174c5fd674e080a7cf782ee64ea0eeb515d5bcee52491b685c01fd98 SHA512 5d0bd8b7c3cefa4d01005473022fee1ee49e845f56c003480edd09bf68ed07ff406160e26232d7febe21cdd5b10de0ec480d1d89d977d546756e437185204e2c
diff --git a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch b/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
deleted file mode 100644
index cad9aa4b682c..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.14.2-CVE-2020-17507.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1616c71921b73b227f56ccb3f2c49a994ec23440 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Thu, 23 Jul 2020 11:48:48 +0200
-Subject: Fix buffer overflow in XBM parser
-
-Avoid parsing over the buffer limit, or interpreting non-hex
-as hex.
-
-This still leaves parsing of lines longer than 300 chars
-unreliable
-
-Change-Id: I1c57a7e530c4380f6f9040b2ec729ccd7dc7a5fb
-Reviewed-by: Robert Loehning <robert.loehning@qt.io>
-Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
-(cherry picked from commit c562c1fc19629fb505acd0f6380604840b634211)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/gui/image/qxbmhandler.cpp                      |  4 ++-
- .../gui/image/qimagereader/tst_qimagereader.cpp    | 38 ++++++++++++++++++++++
- 2 files changed, 41 insertions(+), 1 deletion(-)
-
-diff --git a/src/gui/image/qxbmhandler.cpp b/src/gui/image/qxbmhandler.cpp
-index f06561690c..72ce7f7ecd 100644
---- a/src/gui/image/qxbmhandler.cpp
-+++ b/src/gui/image/qxbmhandler.cpp
-@@ -159,7 +159,9 @@ static bool read_xbm_body(QIODevice *device, int w, int h, QImage *outImage)
-     w = (w+7)/8;                                // byte width
- 
-     while (y < h) {                                // for all encoded bytes...
--        if (p) {                                // p = "0x.."
-+        if (p && p < (buf + readBytes - 3)) {      // p = "0x.."
-+            if (!isxdigit(p[2]) || !isxdigit(p[3]))
-+                return false;
-             *b++ = hex2byte(p+2);
-             p += 2;
-             if (++x == w && ++y < h) {
--- 
-cgit v1.2.1
-
diff --git a/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch b/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch
new file mode 100644
index 000000000000..3e4187b22a06
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.15.1-emit-qscreen-geometrychanged-when-dpi-changes.patch
@@ -0,0 +1,86 @@
+From 65243ad7aef48af4689ea4454916b504025b5051 Mon Sep 17 00:00:00 2001
+From: Friedemann Kleint <Friedemann.Kleint@qt.io>
+Date: Fri, 25 Sep 2020 14:10:58 +0200
+Subject: [PATCH] Emit QScreen::geometryChanged when the logical DPI changes
+
+Add the missing call to QScreenPrivate::emitGeometryChangeSignals()
+along with an emission of physicalDotsPerInchChanged()
+since that is calculated from geometry and physical size.
+
+Rearrange the code in
+QGuiApplicationPrivate::processScreenGeometryChange()
+to prevent duplicate emissions of geometryChanged(),
+physicalDotsPerInchChanged() which this change would introduce.
+
+Amends 5290027e3bab75f14fc0a2b7c206594d9cb91e76.
+
+Task-number: QTBUG-76902
+Task-number: QTBUG-79248
+Fixes: QTBUG-86604
+Change-Id: I3dc2ec5ccd9c6413e92f9246242f323e8afc5e57
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+(cherry picked from commit 5c7307775d32ae0a54acad8ae7a1c9d3cff7d45e)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+---
+ src/gui/kernel/qguiapplication.cpp | 11 +++++------
+ src/gui/kernel/qscreen.cpp         |  6 ++++++
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
+index 239a78313c5..ef090605819 100644
+--- a/src/gui/kernel/qguiapplication.cpp
++++ b/src/gui/kernel/qguiapplication.cpp
+@@ -3162,13 +3162,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
+     bool availableGeometryChanged = e->availableGeometry != s->d_func()->availableGeometry;
+     s->d_func()->availableGeometry = e->availableGeometry;
+ 
+-    if (geometryChanged) {
+-        Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
++    const Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
++    if (geometryChanged)
+         s->d_func()->updatePrimaryOrientation();
+ 
+-        emit s->geometryChanged(s->geometry());
++    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
++
++    if (geometryChanged) {
+         emit s->physicalSizeChanged(s->physicalSize());
+-        emit s->physicalDotsPerInchChanged(s->physicalDotsPerInch());
+         emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch());
+ 
+         if (s->primaryOrientation() != primaryOrientation)
+@@ -3178,8 +3179,6 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
+             updateFilteredScreenOrientation(s);
+     }
+ 
+-    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
+-
+     resetCachedDevicePixelRatio();
+ }
+ 
+diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
+index df628fcc73a..a1afc1ba143 100644
+--- a/src/gui/kernel/qscreen.cpp
++++ b/src/gui/kernel/qscreen.cpp
+@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWithSignals()
+ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged)
+ {
+     Q_Q(QScreen);
++    if (geometryChanged)
++        emit q->geometryChanged(geometry);
++
+     if (availableGeometryChanged)
+         emit q->availableGeometryChanged(availableGeometry);
+ 
+@@ -96,6 +99,9 @@ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availa
+         for (QScreen* sibling : siblings)
+             emit sibling->virtualGeometryChanged(sibling->virtualGeometry());
+     }
++
++    if (geometryChanged)
++        emit q->physicalDotsPerInchChanged(q->physicalDotsPerInch());
+ }
+ 
+ void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)
+-- 
+2.16.3
diff --git a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
deleted file mode 100644
index 1f42c15329e9..000000000000
--- a/dev-qt/qtgui/qtgui-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 707658
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg
-	+libinput +png tslib tuio +udev vnc vulkan wayland +X"
-REQUIRED_USE="
-	|| ( eglfs X )
-	accessibility? ( dbus X )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	X? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}:5=
-	dev-util/gtk-update-icon-cache
-	media-libs/fontconfig
-	>=media-libs/freetype-2.6.1:2
-	>=media-libs/harfbuzz-1.6.0:=
-	sys-libs/zlib:=
-	virtual/opengl
-	dbus? ( ~dev-qt/qtdbus-${PV} )
-	egl? ( media-libs/mesa[egl] )
-	eglfs? (
-		media-libs/mesa[gbm]
-		x11-libs/libdrm
-	)
-	evdev? ( sys-libs/mtdev )
-	gles2-only? ( media-libs/mesa[gles2] )
-	jpeg? ( virtual/jpeg:0 )
-	libinput? (
-		dev-libs/libinput:=
-		>=x11-libs/libxkbcommon-0.5.0
-	)
-	png? ( media-libs/libpng:0= )
-	tslib? ( >=x11-libs/tslib-1.21 )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		>=x11-libs/libxcb-1.12:=[xkb]
-		>=x11-libs/libxkbcommon-0.5.0[X]
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-DEPEND="${RDEPEND}
-	evdev? ( sys-kernel/linux-headers )
-	udev? ( sys-kernel/linux-headers )
-"
-PDEPEND="
-	ibus? ( app-i18n/ibus )
-	wayland? ( ~dev-qt/qtwayland-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/qvkgen
-	src/gui
-	src/openglextensions
-	src/platformheaders
-	src/platformsupport
-	src/plugins/generic
-	src/plugins/imageformats
-	src/plugins/platforms
-	src/plugins/platforminputcontexts
-)
-
-QT5_GENTOO_CONFIG=(
-	accessibility:accessibility-atspi-bridge
-	egl:egl:
-	eglfs:eglfs:
-	eglfs:eglfs_egldevice:
-	eglfs:eglfs_gbm:
-	evdev:evdev:
-	evdev:mtdev:
-	:fontconfig:
-	:system-freetype:FREETYPE
-	!:no-freetype:
-	!gif:no-gif:
-	gles2-only::OPENGL_ES
-	gles2-only:opengles2:OPENGL_ES_2
-	!:no-gui:
-	:system-harfbuzz:
-	!:no-harfbuzz:
-	jpeg:system-jpeg:IMAGEFORMAT_JPEG
-	!jpeg:no-jpeg:
-	libinput
-	libinput:xkbcommon:
-	:opengl
-	png:png:
-	png:system-png:IMAGEFORMAT_PNG
-	!png:no-png:
-	tslib:tslib:
-	udev:libudev:
-	vulkan:vulkan:
-	X:xcb:
-	X:xcb-glx:
-	X:xcb-plugin:
-	X:xcb-render:
-	X:xcb-sm:
-	X:xcb-xlib:
-	X:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
-	"${FILESDIR}/${PN}-5.14.2-CVE-2020-17507.patch" # bug 736924
-)
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
-
-	# egl_x11 is activated when both egl and X are enabled
-	use egl && QT5_GENTOO_CONFIG+=(X:egl_x11:) || QT5_GENTOO_CONFIG+=(egl:egl_x11:)
-
-	qt_use_disable_config dbus dbus \
-		src/platformsupport/themes/genericunix/genericunix.pri
-
-	qt_use_disable_config tuio tuiotouch src/plugins/generic/generic.pro
-
-	qt_use_disable_mod ibus dbus \
-		src/plugins/platforminputcontexts/platforminputcontexts.pro
-
-	use vnc || sed -i -e '/SUBDIRS += vnc/d' \
-		src/plugins/platforms/platforms.pro || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(usex dbus -dbus-linked '')
-		$(qt_use egl)
-		$(qt_use eglfs)
-		$(usex eglfs '-gbm -kms' '')
-		$(qt_use evdev)
-		$(qt_use evdev mtdev)
-		-fontconfig
-		-system-freetype
-		$(usex gif '' -no-gif)
-		-gui
-		-system-harfbuzz
-		$(qt_use jpeg libjpeg system)
-		$(qt_use libinput)
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use png libpng system)
-		$(qt_use tslib)
-		$(qt_use udev libudev)
-		$(qt_use vulkan)
-		$(qt_use X xcb system)
-		$(usex X '-xcb-xlib -xcb-xinput -xkb' '')
-	)
-	if use libinput || use X; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.15.1.ebuild b/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
index e6fed6656239..3e1ba3f077d6 100644
--- a/dev-qt/qtgui/qtgui-5.15.1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.15.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 707658
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 # TODO: linuxfb
@@ -131,6 +131,7 @@ QT5_GENTOO_PRIVATE_CONFIG=(
 PATCHES=(
 	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
 	"${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306
+	"${FILESDIR}/${P}-emit-qscreen-geometrychanged-when-dpi-changes.patch" # QTBUG-86604
 )
 
 src_prepare() {
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 2f0a786a1f84..ebcd145d137d 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD qthelp-5.14.2.ebuild 611 BLAKE2B ea5b3cc287a494c32456fbef38b5f66ac48c803ef1f7fea13171c030974609720ced793f40886f71c5a9cbf13bf97096a83ed11e1dee90334bf8917e900a31fc SHA512 d3849aaa7d5412066a99b757340d75620973f216ac701da56eef3b19aaa477ca91455644913b7a1ab380a5b284b4fd7d0789885047284ccd21709d40ca43490a
-EBUILD qthelp-5.15.1.ebuild 617 BLAKE2B 2ccc37e9d104c03319a35a8ed17ea05a66b1793ecaa64dcef00044f475c31518f65bb422ee2aa2d7428dbc1eefb0def31f18af7aacc6d42615fb7a5128970115 SHA512 84842b51058d20a57043a64bde92f69d38016670168bba14b8925b318a2f0087fa8d2799a24caed2fffe4c386a9cc8e53a4cfcc70e29fc8c4a1a58da8afef91d
+EBUILD qthelp-5.15.1.ebuild 611 BLAKE2B ea5b3cc287a494c32456fbef38b5f66ac48c803ef1f7fea13171c030974609720ced793f40886f71c5a9cbf13bf97096a83ed11e1dee90334bf8917e900a31fc SHA512 d3849aaa7d5412066a99b757340d75620973f216ac701da56eef3b19aaa477ca91455644913b7a1ab380a5b284b4fd7d0789885047284ccd21709d40ca43490a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.14.2.ebuild b/dev-qt/qthelp/qthelp-5.14.2.ebuild
deleted file mode 100644
index 5dddcc287a33..000000000000
--- a/dev-qt/qthelp/qthelp-5.14.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating online documentation into applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtsql-${PV}[sqlite]
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/assistant/help
-	src/assistant/qcollectiongenerator
-	src/assistant/qhelpgenerator
-)
diff --git a/dev-qt/qthelp/qthelp-5.15.1.ebuild b/dev-qt/qthelp/qthelp-5.15.1.ebuild
index 1590efa1a496..5dddcc287a33 100644
--- a/dev-qt/qthelp/qthelp-5.15.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating online documentation into applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index bfac829c6126..5d0149c27173 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,5 +1,3 @@
-DIST qtimageformats-everywhere-src-5.14.2.tar.xz 1805208 BLAKE2B 115939d859478ccb2190c68ea3e93484537d372f62fc03f42931e69c5b7e0f1f84b376659986c3a36082e05930cafd076579c9786f9f4669ebecbb4254ee8d35 SHA512 e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6
 DIST qtimageformats-everywhere-src-5.15.1.tar.xz 1807112 BLAKE2B d90e99c7a374c7aea73a04ba58c537225bb1c3e24d6af7c68e247f8473583dadd6eb369f7c2d9a71f56e27ddc84560ade933c63c549a4739f8e22c8a4cb5d0da SHA512 90da1c76b16dc5ea4ba99372208e3b10619efc4d131686ac6ab4a963ab0177ff9eee9155af564d72052f4ae1c21f06431ab66aa4e55b3c864f015b63ad75c107
-EBUILD qtimageformats-5.14.2.ebuild 670 BLAKE2B 7e0781d822eb83ae28239f7a9c5176f709cea7dc948addd0e05fa2e5e10799f7ef20e8f22683fbfcaaefeb21e7738fc237cdf438b871fc0a925bd36e3f5b4e60 SHA512 d75bcf577b4a7fefb28023ff2459cd7ca15939f948a420ada145aa723b9c2a78eecbfe3089a5808d949426985969e34ec5ee0e8eda0abc77a96b8844cb3f5ba2
-EBUILD qtimageformats-5.15.1.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
+EBUILD qtimageformats-5.15.1.ebuild 670 BLAKE2B 7e0781d822eb83ae28239f7a9c5176f709cea7dc948addd0e05fa2e5e10799f7ef20e8f22683fbfcaaefeb21e7738fc237cdf438b871fc0a925bd36e3f5b4e60 SHA512 d75bcf577b4a7fefb28023ff2459cd7ca15939f948a420ada145aa723b9c2a78eecbfe3089a5808d949426985969e34ec5ee0e8eda0abc77a96b8844cb3f5ba2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
deleted file mode 100644
index e839a0613b3b..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Additional format plugins for the Qt image I/O system"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
-fi
-
-IUSE="mng"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	media-libs/libwebp:=
-	media-libs/tiff:0
-	mng? ( media-libs/libmng:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	sed -e 's/qtConfig(jasper)/false:/' \
-		-i src/plugins/imageformats/imageformats.pro || die
-	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild
index 64b53f6914c5..e839a0613b3b 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 ~sparc x86"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest
index 2db9772bdbb8..c7581cb4cd9f 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,6 +1,3 @@
-AUX qtlocation-5.14.2-gcc-10.patch 1117 BLAKE2B ff43e3d2fa1b4accb03fc5dd1d1e3fa81797dec88c6c5c487a881c4d487d4d4888989087069cac7eb189b61362b8b0cba2b0eae207621e5627f3785a0df6ffe3 SHA512 ef27c87ff3d2092f9a9d115a93ab12e75da7e8cdb857c3acaae6175a3ce758c1c25b99719007b51ef6c1a6ac4d96915a2e89c9b9e733c164fd49a41433ab8d12
-DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
-EBUILD qtlocation-5.14.2.ebuild 1138 BLAKE2B 2e74a03c7a99f819b46fc898dfc6bbc109dad43d9edb3aed326fa9d64ffc58b0d1d6c88d74f875be0eef2bffd6ff2a7edc6be6acc034507e02e90792ec8a7da9 SHA512 ada2afffe3a94ebfc2911944fbdf5e14b7d7889a5836306e80455472f041b5883590b70e06e757cc7598bdfd2229f0d5be27cc4b8a569637e8be763ac1c8ae9e
-EBUILD qtlocation-5.15.1.ebuild 1091 BLAKE2B 8e0032857e92c0d94afc73f4a89c94b3832920840b23f48b5f6af730e5134f8e26736bdcd8ea2eab943908169d618392fb22381affae0d6495548b2702408100 SHA512 c0b1507d3967a523533a437ba45276624d0c68aa23c4ad55b0c25539f5877fa6c474b41cfbef958bd43cb991d98b26ca6cd0e2cd5c4523224906f21365c8c234
+EBUILD qtlocation-5.15.1.ebuild 1087 BLAKE2B 92b7aa503e1da750e4cff065776abe307d1c21e20b84632278399c9a797ddc67ca03f37fa1beec60ba067963988c01a92a87786ca0c767d974799ef2f012e36b SHA512 b61600143e58eb713433a1293ce6f16ee54d51263e7472df94548ecc3a851fb04cd17082f56ca74538d9529bfcecc13c0abe2dd6e61c4412a8289565ded3df7d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch b/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
deleted file mode 100644
index e7cc6f70d055..000000000000
--- a/dev-qt/qtlocation/files/qtlocation-5.14.2-gcc-10.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0853378b2f2de82c59501e31d18906694ec6e27e Mon Sep 17 00:00:00 2001
-From: Bruno de Oliveira Abinader <bruno@mapbox.com>
-Date: Wed, 22 Apr 2020 19:54:53 +0300
-Subject: Fix compilation issues on GCC 9
-
----
- platform/default/bidi.cpp | 1 +
- src/mbgl/util/convert.cpp | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
-index d475c387b..c1710a6f1 100644
---- a/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
-+++ b/src/3rdparty/mapbox-gl-native/platform/default/bidi.cpp
-@@ -5,6 +5,7 @@
- #include <unicode/ushape.h>
- 
- #include <memory>
-+#include <stdexcept>
- 
- namespace mbgl {
- 
-diff --git a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-index 97bfe9108..510ff2386 100644
---- a/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-+++ b/src/3rdparty/mapbox-gl-native/src/mbgl/util/convert.cpp
-@@ -1,5 +1,7 @@
- #include <mbgl/util/convert.hpp>
- 
-+#include <cstdint>
-+
- namespace mbgl {
- namespace util {
- 
--- 
-cgit v1.2.1
diff --git a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
deleted file mode 100644
index 6aa228fb575a..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	dev-libs/icu:=
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtpositioning-${PV}[qml]
-	~dev-qt/qtsql-${PV}
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	~dev-qt/qtconcurrent-${PV}
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/3rdparty/mapbox-gl-native
-	src/location
-	src/imports/location
-	src/imports/locationlabs
-	src/plugins/geoservices
-)
-
-PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" ) # bug 722102
-
-src_configure() {
-	# src/plugins/geoservices requires files that are only generated when
-	# qmake is run in the root directory. Bug 633776.
-	mkdir -p "${QT5_BUILD_DIR}"/src/location || die
-	qt5_qmake "${QT5_BUILD_DIR}"
-	cp src/location/qtlocation-config.pri "${QT5_BUILD_DIR}"/src/location || die
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/qtlocation-5.15.1.ebuild b/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
index 0772e510f28e..b8c3658beb8a 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 arm arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 6953e958a6e5..7b35393f8353 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,6 +1,3 @@
-AUX qtmultimedia-5.14.2-gstreamer-buffering.patch 1516 BLAKE2B 8e80c834a0bb5cc4bcd7b0995a62c7d23777ac4ff5ebe22dad4eb09c0428253b3a4ba28fc6440f5461bb5e1be1c32a3f7f63e63a20a19a6ab750884e26f8f643 SHA512 2ba151ea48aa5dee3e670cfe9b03adfe1ceef23e15d79fdbe2eedf7bb42bf406b8753d2a00fdf14953b6730503bd98687e760cec36b77aface52dc88a06810e0
-DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
 DIST qtmultimedia-everywhere-src-5.15.1.tar.xz 3825940 BLAKE2B 8a86e77b37c7af0226420025f23bcea6aaffcf885f7c56945faa8606bdaf003b29013b452ee2cd44cb1abe7adf260af06f099b7af23664110a97a0dab0574a36 SHA512 9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9
-EBUILD qtmultimedia-5.14.2-r1.ebuild 1535 BLAKE2B 94348292c210c42a846f888384cee6d863cc0c0d6dc27f2c63cfbdb7119f4460b648f7b9ae92e9437f526d4c9d5fd1968369521b019c58ee0da166109d26ba92 SHA512 a46fb3b2e26d3dbd6235236899632b29d0226b4734a93b94c163436e86f3866b1279f6d7ba9ff9b4cd2d729bb3e17bf958d1391cb85e5eca52d52a355ad656bc
-EBUILD qtmultimedia-5.15.1.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
+EBUILD qtmultimedia-5.15.1.ebuild 1462 BLAKE2B 9036ccdd8a1690afdf2a8fb07a38aed37365cc7a9059a192120c8a2136caff7ab592f9eb76308a85f285a50af4f074a4785c4340403bde2da72d49855a99982e SHA512 b4a2434eb36eddb127ee7f0d73c3af7c0c55950fe350dea2bdf7544bd9c91a3c30edb0ddb7548fc866f70c0068a60838aea8f5349fee7be8749ff14a35f4d00d
 MISC metadata.xml 717 BLAKE2B 66c4caae8c3c2d342dda85c4fd88d7dc3ddd8415e5b1e14a6278b324df257212b128b75468581609959b774fd9ba67a01d1294e539bf1c1cbc393aaf1a0bbbdd SHA512 d3d69ed7c2f42dbbf33aa360ef34dc2a0687be44a795ce2ee6c4b34603a7767b4e66c652e500ae3beed47cb1d6e73be5ffa13cf4bb1d33e3fc3f0154f950bee5
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
deleted file mode 100644
index 5d17b079613d..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.14.2-gstreamer-buffering.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d8d072417b08dd75734b3f0aa86c3a49db934770 Mon Sep 17 00:00:00 2001
-From: Roman Valov <roman.valov@gmail.com>
-Date: Mon, 13 Apr 2020 12:54:09 +0000
-Subject: [PATCH] Gstreamer: fix stream buffering
-
-Gstreamer client should handle GST_MESSAGE_BUFFERING to play and pause
-streams based on buffer-percent value and Qt does it properly.
-However `updateSessionState` of QGstreamerPlayerControl was implemented
-to go back into playing state each time session state becomes paused.
-That behavior resulted into choppy stream playback.
-Fix with condition to un-pause playback only if it's already buffered.
-
-Fixes: QTBUG-83417
-Change-Id: Ida4a9e2e196de00050bdc64725fa818c7e939785
-Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
----
- src/gsttools/qgstreamerplayercontrol.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/gsttools/qgstreamerplayercontrol.cpp b/src/gsttools/qgstreamerplayercontrol.cpp
-index 165978288..d65102e2f 100644
---- a/src/gsttools/qgstreamerplayercontrol.cpp
-+++ b/src/gsttools/qgstreamerplayercontrol.cpp
-@@ -439,8 +439,10 @@ void QGstreamerPlayerControl::updateSessionState(QMediaPlayer::State state)
-         }
-         m_pendingSeekPosition = -1;
- 
--        if (m_currentState == QMediaPlayer::PlayingState)
--            m_session->play();
-+        if (m_currentState == QMediaPlayer::PlayingState) {
-+            if (m_mediaStatus == QMediaPlayer::BufferedMedia)
-+                m_session->play();
-+        }
-     }
- 
-     updateMediaStatus();
--- 
-2.16.3
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
deleted file mode 100644
index fdcd87079b9e..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2-only? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2-only=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gstreamer-buffering.patch" # QTBUG-83417
-)
-
-src_prepare() {
-	sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
-		src/multimedia/multimedia.pro || die
-
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
index f8b9dfe3d426..33eb59e9fbe4 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="alsa gles2-only gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 78e2be2318a0..30a1956468a2 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,4 @@
-AUX qtnetwork-5.14.2-CVE-2020-13962.patch 7797 BLAKE2B ad7f5fbbbafe784c7f88877f8537f847f58cdf082abb2a60674447aef6c1e1043530b85bd487add8b4a81e366728ea9a8076968910ec82c1e3e4de991b216c97 SHA512 dff8c492c99fa18653af663d1e6766c10c5788f3e0fef95a246b5d8a8a95413105fb6b9ea5945a4f400fddb09701852fa046e14bdb1ad2e31b8a3c78743b3b9d
 AUX qtnetwork-5.15.1-libressl.patch 16941 BLAKE2B 07b54a11d57609066cc245f2850dc955aa3ca3c8c5d7ea132dfcec72250b43b3e12b72b8b919bf522d3e32f9d8f2452f34b94fde6174d6fb9776bbd1328d1820 SHA512 300f6d5af014daecee0bcdd16aa896b7efebbe6eb06e6d4f5c2d59f370527edf8783da8449a4c87fca617ce2e4d305ea68c5f68854b618d257fb31a1f1aa701f
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtnetwork-5.14.2-r1.ebuild 1473 BLAKE2B 4d867f30a6e11d2ae59c2d85b470aae5e5f697c31f9fe046dacd1c5389e1ae931042accabcffa41db58227b2ad4c8550f6741e6262aaddb6a79b5a77be73fb45 SHA512 6e3bec5875b1ba8919cf1aa46e678a51294f58f8af26211ae3d531023cc0fc70b285e7bc8b19abf9712c97124c498b41850550e047915de00868d2ff41cf0062
-EBUILD qtnetwork-5.15.1.ebuild 1541 BLAKE2B d19867e389b8d74da15d47de791e5c10c6dc4033bf03a2e284aeffad4e0d4eab64f4645edc6d50d92682a6216dd8cef636f97c96b475048f58f293cc9e09653b SHA512 5d219fd8f02ed32fe329dead727997d2dd47a8e6bdaf3448f580c37618be489d290dc66eaf347248cd0090f582aa2cddad571c0f9e6b3137f1b7e031baaf4884
+EBUILD qtnetwork-5.15.1-r1.ebuild 1544 BLAKE2B 2129568d3b48d17e4a950c73f74c692427b470d9fd15c7be9e5c960fed8b276ebaf4ede53a22c7b2069a1ebb3b9986a8ba5dafdd4ec050a9c4282c5436de4989 SHA512 fb09f7261484d5786ba13e4a02b9678cb14906cbe5b8c2c23fcc3b5493714f7d969d52fdb09359dc12c2bb0950868eb2400c02b51f4538b38e9e5b8a6c6bfb3e
 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch b/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
deleted file mode 100644
index 9bbdda61a25a..000000000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.14.2-CVE-2020-13962.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 8ddffc6ba4f38bb8dbeb0cf61b6b10ee73505bbb Mon Sep 17 00:00:00 2001
-From: Timur Pocheptsov <timur.pocheptsov@qt.io>
-Date: Mon, 13 Apr 2020 20:31:34 +0200
-Subject: [PATCH] OpenSSL: handle SSL_shutdown's errors properly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Do not call SSL_shutdown on a session that is in handshake state (SSL_in_init(s)
-returns 1). Also, do not call SSL_shutdown if a session encountered a fatal
-error (SSL_ERROR_SYSCALL or SSL_ERROR_SSL was found before). If SSL_shutdown
-was unsuccessful (returned code != 1), we have to clear the error(s) it queued.
-Unfortunately, SSL_in_init was a macro in OpenSSL 1.0.x. We have to
-resolve SSL_state to implement SSL_in_init.
-
-Fixes: QTBUG-83450
-Change-Id: I6326119f4e79605429263045ac20605c30dccca3
-Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-(cherry picked from commit 8907635da59c2ae0e8db01f27b24a841b830e655)
----
- src/network/ssl/qsslsocket.cpp                     |  2 +-
- src/network/ssl/qsslsocket_openssl.cpp             | 23 ++++++++++++++++------
- src/network/ssl/qsslsocket_openssl11_symbols_p.h   |  7 +++++++
- src/network/ssl/qsslsocket_openssl_symbols.cpp     |  8 ++++++++
- .../ssl/qsslsocket_opensslpre11_symbols_p.h        |  2 ++
- src/network/ssl/qsslsocket_p.h                     |  1 +
- 6 files changed, 36 insertions(+), 7 deletions(-)
-
-diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
-index 4e9e9472631..5c9e589ec39 100644
---- a/src/network/ssl/qsslsocket.cpp
-+++ b/src/network/ssl/qsslsocket.cpp
-@@ -2166,7 +2166,7 @@ void QSslSocketPrivate::init()
-     pendingClose = false;
-     flushTriggered = false;
-     ocspResponses.clear();
--
-+    systemOrSslErrorDetected = false;
-     // we don't want to clear the ignoreErrorsList, so
-     // that it is possible setting it before connecting
- //    ignoreErrorsList.clear();
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 51510f1c60b..855865209bc 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -648,10 +648,16 @@ bool QSslSocketBackendPrivate::initSslContext()
- void QSslSocketBackendPrivate::destroySslContext()
- {
-     if (ssl) {
--        // We do not send a shutdown alert here. Just mark the session as
--        // resumable for qhttpnetworkconnection's "optimization", otherwise
--        // OpenSSL won't start a session resumption.
--        q_SSL_shutdown(ssl);
-+        if (!q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
-+            // We do not send a shutdown alert here. Just mark the session as
-+            // resumable for qhttpnetworkconnection's "optimization", otherwise
-+            // OpenSSL won't start a session resumption.
-+            if (q_SSL_shutdown(ssl) != 1) {
-+                // Some error may be queued, clear it.
-+                const auto errors = getErrorsFromOpenSsl();
-+                Q_UNUSED(errors);
-+            }
-+        }
-         q_SSL_free(ssl);
-         ssl = nullptr;
-     }
-@@ -1084,6 +1090,7 @@ void QSslSocketBackendPrivate::transmit()
-             case SSL_ERROR_SSL: // error in the SSL library
-                 // we do not know exactly what the error is, nor whether we can recover from it,
-                 // so just return to prevent an endless loop in the outer "while" statement
-+                systemOrSslErrorDetected = true;
-                 {
-                     const ScopedBool bg(inSetAndEmitError, true);
-                     setErrorAndEmit(QAbstractSocket::SslInternalError,
-@@ -1681,8 +1688,12 @@ bool QSslSocketBackendPrivate::checkOcspStatus()
- void QSslSocketBackendPrivate::disconnectFromHost()
- {
-     if (ssl) {
--        if (!shutdown) {
--            q_SSL_shutdown(ssl);
-+        if (!shutdown && !q_SSL_in_init(ssl) && !systemOrSslErrorDetected) {
-+            if (q_SSL_shutdown(ssl) != 1) {
-+                // Some error may be queued, clear it.
-+                const auto errors = getErrorsFromOpenSsl();
-+                Q_UNUSED(errors);
-+            }
-             shutdown = true;
-             transmit();
-         }
-diff --git a/src/network/ssl/qsslsocket_openssl11_symbols_p.h b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
-index 0fe0899d4fd..b7193ad1807 100644
---- a/src/network/ssl/qsslsocket_openssl11_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_openssl11_symbols_p.h
-@@ -192,4 +192,11 @@ typedef int (*q_SSL_psk_use_session_cb_func_t)(SSL *, const EVP_MD *, const unsi
- }
- void q_SSL_set_psk_use_session_callback(SSL *s, q_SSL_psk_use_session_cb_func_t);
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+// What a mess!
-+int q_SSL_in_init(SSL *s);
-+#else
-+int q_SSL_in_init(const SSL *s);
-+#endif // 1.1.1 or 1.1.0
-+
- #endif
-diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-index 85029a6ff3f..d1bd84cf25f 100644
---- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -160,6 +160,11 @@ DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
- DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
- DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
- DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return)
-+#else
-+DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return)
-+#endif
- #ifdef TLS1_3_VERSION
- DEFINEFUNC2(int, SSL_CTX_set_ciphersuites, SSL_CTX *ctx, ctx, const char *str, str, return 0, return)
- DEFINEFUNC2(void, SSL_set_psk_use_session_callback, SSL *ssl, ssl, q_SSL_psk_use_session_cb_func_t callback, callback, return, DUMMYARG)
-@@ -242,6 +247,7 @@ DEFINEFUNC2(void, BIO_set_shutdown, BIO *a, a, int shut, shut, return, DUMMYARG)
- // Functions below are either deprecated or removed in OpenSSL >= 1.1:
- 
- DEFINEFUNC(unsigned char *, ASN1_STRING_data, ASN1_STRING *a, a, return nullptr, return)
-+DEFINEFUNC(int, SSL_state, const SSL *a, a, return 0, return)
- 
- #ifdef SSLEAY_MACROS
- DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return nullptr, return)
-@@ -971,6 +977,7 @@ bool q_resolveOpenSslSymbols()
- #if QT_CONFIG(opensslv11)
- 
-     RESOLVEFUNC(OPENSSL_init_ssl)
-+    RESOLVEFUNC(SSL_in_init)
-     RESOLVEFUNC(OPENSSL_init_crypto)
-     RESOLVEFUNC(ASN1_STRING_get0_data)
-     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
-@@ -1066,6 +1073,7 @@ bool q_resolveOpenSslSymbols()
- #else // !opensslv11
- 
-     RESOLVEFUNC(ASN1_STRING_data)
-+    RESOLVEFUNC(SSL_state)
- 
- #ifdef SSLEAY_MACROS
-     RESOLVEFUNC(ASN1_dup)
-diff --git a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
-index f5626d5d164..92841017793 100644
---- a/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
-+++ b/src/network/ssl/qsslsocket_opensslpre11_symbols_p.h
-@@ -121,6 +121,8 @@ SSL_CTX *q_SSL_CTX_new(const SSL_METHOD *a);
- 
- int q_SSL_library_init();
- void q_SSL_load_error_strings();
-+int q_SSL_state(const SSL *a);
-+#define q_SSL_in_init(a) (q_SSL_state(a) & SSL_ST_INIT)
- 
- #if OPENSSL_VERSION_NUMBER >= 0x10001000L
- int q_SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
-index daa9be23f4a..350b1f1fc18 100644
---- a/src/network/ssl/qsslsocket_p.h
-+++ b/src/network/ssl/qsslsocket_p.h
-@@ -208,6 +208,7 @@ protected:
-     bool verifyErrorsHaveBeenIgnored();
-     bool paused;
-     bool flushTriggered;
-+    bool systemOrSslErrorDetected = false;
-     QVector<QOcspResponse> ocspResponses;
- };
- 
--- 
-2.16.3
diff --git a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
deleted file mode 100644
index e26d2f3855c0..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	gssapi? ( virtual/krb5 )
-	libproxy? ( net-libs/libproxy )
-	networkmanager? ( ~dev-qt/qtdbus-${PV} )
-	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
-	ssl? ( dev-libs/openssl:0=[bindist=] )
-"
-RDEPEND="${DEPEND}
-	connman? ( net-misc/connman )
-	networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/network
-	src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
-	libproxy:libproxy:
-	ssl::SSL
-	ssl::OPENSSL
-	ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:network
-)
-
-PATCHES=(
-	"${FILESDIR}/${P}-CVE-2020-13962.patch" # bug 727604, QTBUG-83450
-)
-
-pkg_setup() {
-	use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
-	use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
-	local myconf=(
-		$(usex connman -dbus-linked '')
-		$(usex gssapi -feature-gssapi -no-feature-gssapi)
-		$(qt_use libproxy)
-		$(usex networkmanager -dbus-linked '')
-		$(qt_use sctp)
-		$(usex ssl -openssl-linked '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.1-r1.ebuild
index 80d776c1540e..38835c81708f 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.1-r1.ebuild
@@ -2,13 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 QT5_MODULE="qtbase"
 inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="bindist connman gssapi libressl libproxy networkmanager sctp +ssl"
@@ -22,7 +23,7 @@ DEPEND="
 	networkmanager? ( ~dev-qt/qtdbus-${PV} )
 	sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
+		!libressl? ( >=dev-libs/openssl-1.1.1:0=[bindist=] )
 		libressl? ( dev-libs/libressl:0= )
 	)
 "
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 8fbad1759fee..170df15c9005 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,5 +1,3 @@
-DIST qtnetworkauth-everywhere-src-5.14.2.tar.xz 141424 BLAKE2B 11adc6be96f4bc4247aa04a0b21bb142cc8d63dbe547a271759e7c564dde031193f1eceae4366791afd1bc9734be0eef23b538817feb5431322002bab5d39595 SHA512 9001755ae289213f7d2c994bedbbcc1ca641b3c80fc5279f6829ed48c31eed8cdbd87a0ed0ce451bc9611318ef09ef7c40b795d2c45fface2bd357ee579b15ad
 DIST qtnetworkauth-everywhere-src-5.15.1.tar.xz 141416 BLAKE2B 428f55b4d08c88b837b4c3397e13d7296855fd930df0fc319e564709993b4cc4dc7e1f2179c26f7f08e1b33172f62a4e1f7f373439f9ca341cbc821083dce6dc SHA512 2c22acf4842f2e26c514ea48bd4e21f466571c1993b811495c1eb9fe22ea66a687ca882c9ed09b38c00a9a6616b13d44021e0d9a65020f4ab9495d6e8c64d282
-EBUILD qtnetworkauth-5.14.2.ebuild 377 BLAKE2B cfc5af1d28c83adc26feb60e954d691bb3c68f205e4a82445da360e960aca4d3f0ade463f622e7b56fdb254522abf2489e2d8882f24edb579319a541c38c165f SHA512 8428aa168f5278bd76aa403a14889f58575340fda332f83271f045c1cae60c4864e498cd282dff3e8bca937f9b55d7b55835a8180a70e647ada72d109c529d57
-EBUILD qtnetworkauth-5.15.1.ebuild 387 BLAKE2B 742301fd443101d581d199dc5e458cacdd5eaa2bbc589d883900c5592a50b9ea9181537e6eb5641391f9f31d7d9ff333b2709b1370d26619d9b84342299b5b93 SHA512 bf08b5ff57c011f25067edd3701a1228e5d207c2992b6ae6c69a968da2c4ebe12f20b24aca4026f2414ef12e52437ba5e81f187dfbece328375dfd89c95dd89e
+EBUILD qtnetworkauth-5.15.1.ebuild 384 BLAKE2B 7c063ea7b1d56969141c592d62bf569fe7f8c7fb1ef82bde53d82a7e0b6402d13606f90cab416f49c1cbefc3596fe0438a3fb8a529b1d7dc134fdbed526baa69 SHA512 d6b7943ca11985416a3b9c71cc4ab837e4799e78ef601d006d50fd531b753fda15e3ce078c7ce62ec0241c9820a64130dd3c3e88b94989d6776061e6cccbdf16
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild
deleted file mode 100644
index 05f6b5ff0898..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.14.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Network authorization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
index 8ccea6f99079..6962e0be789e 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.15.1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index ca1fcb2aa4e4..5b67182411aa 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtopengl-5.14.2-r1.ebuild 657 BLAKE2B 02264b13ffe36f059e903d6ae8ccfc5cc252133114975704a1bc0785a64ddb77be30e3ad13e4bd179c6418b87e3a079deefb3dda122683e9d9e818e3675c927e SHA512 8c7ba6eb0a68b1fd6a723beba69ba3d23c91f022a092c98dc7e0537d0a25900a894a719f2436671bfe7f35976e9ac9581853f93f5f67b5b37855f6509c276f5e
-EBUILD qtopengl-5.15.1.ebuild 680 BLAKE2B aa61e1c30bf829f9e9fc5747fd786f8566514833c7989f90e5ea837abfb8290a3a5d2c1c64cc8c515824be49a142e21b511058d765cb51c3344adc5151fa1346 SHA512 d3451a4b3839bfa7781a7c66c8d3442e813292c04dbf0ce2df16e82d8f96f70835fa3504a2f9cd4e5c641affed35aaace652d95e1f697bed58722b2cca589670
+EBUILD qtopengl-5.15.1.ebuild 674 BLAKE2B 19e650d95d1a720788128a0634bb2e9d0fac05747cdd962500c3eaaa145470b51eea512a45b33b5709498cb51259f776783f6fea6b8b5d615ec89b62c09c6f8f SHA512 63e4080f0b97961b9844b9ccaa946018da74cf28efd4441ef6619959e9367d77af8274954603dbce1f16ae27fca853a9c09e59d4a958654680cf2cf6c850b480
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild b/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
deleted file mode 100644
index a2f5822ec72f..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	virtual/opengl
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/opengl
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtopengl/qtopengl-5.15.1.ebuild b/dev-qt/qtopengl/qtopengl-5.15.1.ebuild
index 3aaab692c82d..9832679e0b3c 100644
--- a/dev-qt/qtopengl/qtopengl-5.15.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.15.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="gles2-only"
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index 8e4f211d8002..afef3be758bc 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD qtpaths-5.14.2.ebuild 408 BLAKE2B 0ec3c625d045bc5d9386889a1370c7c5a05f68eb2b8953d66e07c92889d5c16e72846b990b76cead4610b0183b7b99f384465cc61def057fdafd86c23ceed70d SHA512 aee2f4a9e91fc2d95a67aab93d2fc2cec44b61edaffe988dd8a8b728d64d50ce769719e728e00705198a2d73d9903e9446cdd963002a5585b3efd5032bef5291
-EBUILD qtpaths-5.15.1.ebuild 376 BLAKE2B c982d55c17f2ef91ed863415d5fce751d691b56e8d836df5af552cc1b3bfde729b120bd7f1b89f6f434fa449dabc4f64392a6c08a0fa2a40a27a21b30bafabba SHA512 ca17f0f3f5adeb9a47a592fe9b91cb4fb05e33ae3549e66b88760a1914e5776478c0ded75c1c3d79d7e85ecf3f693a53c208f373b18bc973206b1b813264621b
+EBUILD qtpaths-5.15.1.ebuild 371 BLAKE2B f4c8f149c2c2747c38d847acb3f608507095324f6a74205264c3cb1f9daf430ef38a81d57f9dc3249400895fc5640e0af8780809eef388fff27e51b0c799bf2a SHA512 6eea6e0c299592ea5dfaa68ed616230e617f11205e7d25a9a508d81c71b528193c5e5f16106bf1080b701932e186bd7102e12681d441c794c025713a916d8d5c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.14.2.ebuild b/dev-qt/qtpaths/qtpaths-5.14.2.ebuild
deleted file mode 100644
index d3f77cca75f8..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.14.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Command line client to QStandardPaths"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtpaths/qtpaths-5.15.1.ebuild b/dev-qt/qtpaths/qtpaths-5.15.1.ebuild
index c221a48484b2..8cf43c4c112c 100644
--- a/dev-qt/qtpaths/qtpaths-5.15.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Command line client to QStandardPaths"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index ab7ca377e30c..a80afd5074d2 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,5 +1,3 @@
-DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
 DIST qttools-everywhere-src-5.15.1.tar.xz 8901096 BLAKE2B f8927993dfc6888a1143b6a8ce09f075636600f77891edb64dd5c39bee75e2c752d3da4443c7956297c65c5b7f1103b1c6bb53b607cd054473a96adc1350e2b9 SHA512 8c7851431de8686a01fc5f85de5dcfa61b6878bd65b53ed78a8a23e57de70f2dcc1a72b4eed9a7219cfd443215a32a59a25fb929d343afcfd498517d6bcfb951
-EBUILD qtplugininfo-5.14.2.ebuild 370 BLAKE2B 6969a0764d14c2a08f4413c3599833a4cdca6a5b0b130d8f47de2c5e80ef195672936654d149391b891a491234148a12a6188cc387da56d16c19d5939706078f SHA512 c96b693b6e76f1115e0822136d6bc654ac7bb8c52411b7e837072917101b273fa017651ca65a6af2b4e483bfa711b837131d6844080e5db46bc339c9bae4af5d
 EBUILD qtplugininfo-5.15.1.ebuild 328 BLAKE2B 1be3d8b5073f721fe2248014dc4f098dedf4814fc173e4e58c494ccce473934932f50fe146c873a481eda0bb1e74bcaf21c417071de888523cab3d946d232fe9 SHA512 5e09c9bf54525084454997a6f9a2a2ad3686478e7d311328d000cb192aa6d3435ec71a7aec36d284d6a505ab63fc54e075b8db3df5bfe04df035904fb246ace4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild
deleted file mode 100644
index 20db4ecf2a37..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.14.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 55a1506ad365..10580e5bbd9a 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,5 +1,3 @@
-DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
 DIST qtlocation-everywhere-src-5.15.1.tar.xz 6553252 BLAKE2B 493ea55065f03f05db7c65c22f53b96a62b3912a62f3385d393650a96b156e5a5d76dfe5ed3df8eee5ce379c9bbf36a62b6f088dab0519bd14355a7ba956a279 SHA512 b79383b60107bc4d8fcc9b4a087db57597d0b928248806fef9dfeaa8ce3347ce96b388cbce1a7bcaf3287d380f7c269c44e8ec25966112c041aa298313854106
-EBUILD qtpositioning-5.14.2.ebuild 847 BLAKE2B e8d6459712a242ca2b5af814787ba320db7655dc68408863f7a6b6b14d825d3510c9b70b992e359fdb27b925a433e311a6fd2ff38c6dc5bec11ad293d93f176f SHA512 fdce4556ef51773005d8e2b27bdb480ec2569704c95cb8e2ed898d8e874d3bd83df6d1c09df6f2514d18e1e0b7513b7180eb86aaa4309fdc11fc8ba1806c463c
-EBUILD qtpositioning-5.15.1.ebuild 853 BLAKE2B d89c06e274722250787fc29a1bf8106cd84b18015872482efc8b00439a02cf45ca5d612d167b9f21e934ea971eb7a44ce541e12794d4bbae4acf42cc58239ab4 SHA512 629a2deda3ab8b945e72062d4f9b5de8f24881ab0f401a429b34358243a43828b72e0ba46d4d1b691f85b3e5f8e3b69053e22afce9544ec862566914b049d766
+EBUILD qtpositioning-5.15.1.ebuild 847 BLAKE2B e8d6459712a242ca2b5af814787ba320db7655dc68408863f7a6b6b14d825d3510c9b70b992e359fdb27b925a433e311a6fd2ff38c6dc5bec11ad293d93f176f SHA512 fdce4556ef51773005d8e2b27bdb480ec2569704c95cb8e2ed898d8e874d3bd83df6d1c09df6f2514d18e1e0b7513b7180eb86aaa4309fdc11fc8ba1806c463c
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
deleted file mode 100644
index 00e76ee9b7d5..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtlocation"
-inherit qt5-build
-
-DESCRIPTION="Physical position determination library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="geoclue +qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	geoclue? ( ~dev-qt/qtdbus-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	geoclue? ( app-misc/geoclue:2.0 )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/3rdparty/clipper
-	src/3rdparty/poly2tri
-	src/3rdparty/clip2tri
-	src/positioning
-	src/plugins/position/positionpoll
-)
-
-pkg_setup() {
-	use geoclue && QT5_TARGET_SUBDIRS+=( src/plugins/position/geoclue2 )
-	use qml && QT5_TARGET_SUBDIRS+=(
-		src/positioningquick
-		src/imports/positioning
-	)
-}
diff --git a/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
index 0db24b237f92..00e76ee9b7d5 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index fb1804bd8ce9..fe1851db4fae 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtprintsupport-5.14.2.ebuild 782 BLAKE2B eda12b0d36a6e7cbe8c012ad1bb2651f60fe2c6be4f5bac0edd74048758467252110a1a002a2d526c2093715eeb3e3de20b5099708701780848d370270c10022 SHA512 0edc6c43dedcd833efb4ee37ce934266354da9a482b1db77619ba529c2cc4223b51b86c72c433b8462b09a6fbb603819ea396d40394732cbd1a24deb7df83ca5
-EBUILD qtprintsupport-5.15.1.ebuild 788 BLAKE2B d706d8e3afc1d8cb1d7b9c9af2320fcf5a6040fb7e53a268374c966274b9b10d6a4b66e44ebda267a5ab23c80566f8d690ed2fe97c9d4e829431b9e89839d3f6 SHA512 d42803cf2bc3d45c94bf454001fcb4a155121a230072e494acf03efaf85b3c35993fb20106ff966ad09026e8240a1371ea7e2616e7a63679b441d678341f079e
+EBUILD qtprintsupport-5.15.1.ebuild 782 BLAKE2B eda12b0d36a6e7cbe8c012ad1bb2651f60fe2c6be4f5bac0edd74048758467252110a1a002a2d526c2093715eeb3e3de20b5099708701780848d370270c10022 SHA512 0edc6c43dedcd833efb4ee37ce934266354da9a482b1db77619ba529c2cc4223b51b86c72c433b8462b09a6fbb603819ea396d40394732cbd1a24deb7df83ca5
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
deleted file mode 100644
index babe7326c5b9..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~dev-qt/qtwidgets-${PV}[gles2-only=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2-only es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild
index 5945c013cb24..babe7326c5b9 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Printing support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="cups gles2-only"
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 8fe0dee6776f..a7222244dafb 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,3 @@
-DIST qtquickcontrols-everywhere-src-5.14.2.tar.xz 5981560 BLAKE2B 91ac3b77d0f1e83a489148aae8b143d2f1131020084c22dc0a2ad9aecbff16bd19ea5a3f09eaba3146e5034b6914a696d6eacd0307ec8ca7c260318c49772564 SHA512 e5076d838e54e8fcc62ffd76d66ab322f1927f6489c51dd0fa6e39de1e003c1994d24730da79c8d9d2747839faaa7b1b78f14b58f05447db440a477094be40e4
 DIST qtquickcontrols-everywhere-src-5.15.1.tar.xz 5983304 BLAKE2B 14ec58e4a1ae70617c74bdd5c3cd992e0c3a2c96540963edc2cba796e7730607df331167a928fd2e2dedc27457b4b27824b680b2670ca8e538423290d8cd6776 SHA512 71e6ee040bc76dc1576d31ff2c1d687e115f4c6dc63307e64c8173c2441835923375ee6b7f5473b3ec8c586f34e04b061b9a9e16b7f34b4075cfa0278599d2ce
-EBUILD qtquickcontrols-5.14.2.ebuild 737 BLAKE2B 0a94889ceea8601da415b2c3327e299669e199b9d1fa02f9ddbac0b7aaea0ebab22a39251f623ad7d7981c23bdd9507abb0c578b4781a866f9a401fef5a3bf03 SHA512 0e93c4e36c6227a4bf30676f8fba75d181f9ebbb7ac0dba90bfe0ee9931db1b1cb5231b6734bacc31ef13b3a8c848a59178df3a3c4b32a315b2b61555cedc688
-EBUILD qtquickcontrols-5.15.1.ebuild 742 BLAKE2B bdb7ed3afb9cee48ff6ade378810f953b6ea60d3bb9704efbeffc13fdc48d5bd49fb7029ab21117ca13f56c03d191d3c642fbc92e893a7a2451050953a982974 SHA512 78ee6efb4d458c0361f98bbd6269be84107fa488b43d8fa77f5c54d0543f2ed9d738e6aba3a2219c3b25387fa482c988167f0a27d0ebd35663a74cf1b0a9025f
+EBUILD qtquickcontrols-5.15.1.ebuild 737 BLAKE2B 0a94889ceea8601da415b2c3327e299669e199b9d1fa02f9ddbac0b7aaea0ebab22a39251f623ad7d7981c23bdd9507abb0c578b4781a866f9a401fef5a3bf03 SHA512 0e93c4e36c6227a4bf30676f8fba75d181f9ebbb7ac0dba90bfe0ee9931db1b1cb5231b6734bacc31ef13b3a8c848a59178df3a3c4b32a315b2b61555cedc688
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild
deleted file mode 100644
index 3ca97181e2ac..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
-fi
-
-IUSE="+widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/controls/Private/private.pri \
-		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
-		tests/auto/controls/controls.pro \
-		tests/auto/testplugin/testplugin.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild
index c2df28c1c253..3ca97181e2ac 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/Manifest b/dev-qt/qtquickcontrols2/Manifest
index ac8be767fa71..50740dae5caa 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,6 +1,3 @@
-AUX qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch 2268 BLAKE2B e321a635cc94d92245291539d862aa1cfc63bc6a558d6ddc792800be409dff11b1777349aed394d0e9df5dbfae29cd71681271eda1c68745af3ec1e1e76eabed SHA512 6d559d5c128e0046319fb8d6bdd3914a30eae41315efd267e6271c3f69759024abb79c7cb3a604c8bb58936a2daf25fd1217ee877516b65b8d5262fd76dac39f
-DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722
 DIST qtquickcontrols2-everywhere-src-5.15.1.tar.xz 8282444 BLAKE2B 94be5403a3642ceb1ce8eb7ceae2a116743f5ee75c0614448bbfb846918d108f3c5bb6ad881bb63eb30082f0bbeed28a49e32456d335e67f19dc65418c76216a SHA512 ecb75619e80b737e3ae214f65a5175d933f8dc7832eb4eccd469fc1cb1eb85ef5c47f81563165da2d75abf15d7c47b868e68ab758d95183371b4ef64e7c52a39
-EBUILD qtquickcontrols2-5.14.2-r1.ebuild 696 BLAKE2B eb186869701f065ef1b1f8bd3e51055bf796c388dd9f4511fbb5471911e193a0a9d451fcf3a1c1bde2699123420345c08c20ca6df221ea33cabc78b376fafada SHA512 c6103cf3fdabf9b9c105426032b0c41ee3397aa94363d098cc06e1abde3d1cd46591022c9d845b4c8a41eea3605eca126715b3e471c8623f55d2d4098c4932b4
-EBUILD qtquickcontrols2-5.15.1.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93
+EBUILD qtquickcontrols2-5.15.1.ebuild 606 BLAKE2B 0d3d0105694c0a2be2ea02a6a4605dc3174de9535b4997f35a7dce5bb73ec782767e871e95ab1ff16103bc214eb9753b01085d1919827ad64d31b8cb6381f8bc SHA512 37a4182eb357133277b9e40af464ddf2d8cb0fd2a4990de23e986f5e764249e61a09674493042b13da62be44097fb3d717495161d771a99500241cd1db00fe0e
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch b/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch
deleted file mode 100644
index ae54f12f3652..000000000000
--- a/dev-qt/qtquickcontrols2/files/qtquickcontrols2-5.14.2-account-for-scale-before-positioning.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4df52eee2b40244ba1a3d115a43ed51cfd742105 Mon Sep 17 00:00:00 2001
-From: Andy Shaw <andy.shaw@qt.io>
-Date: Thu, 7 Feb 2019 17:35:51 +0100
-Subject: [PATCH] Menu: account for the scale when getting the size before
- positioning
-
-Fixes: QTBUG-73687
-Change-Id: Id2d6a6b5c6651337ab7ae26d07011160b79654bf
-Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
----
- src/quicktemplates2/qquickpopup.cpp           |  1 +
- src/quicktemplates2/qquickpopuppositioner.cpp | 14 +++++++-------
- 3 files changed, 17 insertions(+), 15 deletions(-)
-
-diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp
-index ecb2568ed..d108420ea 100644
---- a/src/quicktemplates2/qquickpopup.cpp
-+++ b/src/quicktemplates2/qquickpopup.cpp
-@@ -471,6 +471,7 @@ void QQuickPopupPrivate::finalizeEnterTransition()
-     if (focus)
-         popupItem->setFocus(true);
-     transitionState = NoTransition;
-+    getPositioner()->reposition();
-     emit q->openedChanged();
-     emit q->opened();
- }
-diff --git a/src/quicktemplates2/qquickpopuppositioner.cpp b/src/quicktemplates2/qquickpopuppositioner.cpp
-index ebd8ff294..dbe8ac1d5 100644
---- a/src/quicktemplates2/qquickpopuppositioner.cpp
-+++ b/src/quicktemplates2/qquickpopuppositioner.cpp
-@@ -108,10 +108,11 @@ void QQuickPopupPositioner::reposition()
-         return;
-     }
- 
--    const qreal w = popupItem->width();
--    const qreal h = popupItem->height();
--    const qreal iw = popupItem->implicitWidth();
--    const qreal ih = popupItem->implicitHeight();
-+    const qreal scale = popupItem->scale();
-+    const qreal w = popupItem->width() * scale;
-+    const qreal h = popupItem->height() * scale;
-+    const qreal iw = popupItem->implicitWidth() * scale;
-+    const qreal ih = popupItem->implicitHeight() * scale;
- 
-     bool widthAdjusted = false;
-     bool heightAdjusted = false;
-@@ -257,10 +258,9 @@ void QQuickPopupPositioner::reposition()
-     }
- 
-     if (!p->hasWidth && widthAdjusted && rect.width() > 0)
--        popupItem->setWidth(rect.width());
-+        popupItem->setWidth(rect.width() / scale);
-     if (!p->hasHeight && heightAdjusted && rect.height() > 0)
--        popupItem->setHeight(rect.height());
--
-+        popupItem->setHeight(rect.height() / scale);
-     m_positioning = false;
- }
- 
--- 
-2.16.3
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
deleted file mode 100644
index 05d48cade927..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.14.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-IUSE="widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-RDEPEND="${DEPEND}
-	~dev-qt/qtgraphicaleffects-${PV}
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-account-for-scale-before-positioning.patch" # QTBUG-73687
-)
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild
index 90962415a9f5..d9241d146306 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 60f8f0f81c28..d8fc8ddc84bb 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,5 +1,3 @@
-DIST qtscript-everywhere-src-5.14.2.tar.xz 2654528 BLAKE2B cb749d1db5774ef1e236ec82f57ca17fdb85bfec02f7dc346ceb0bb316783c8e1bdfe5b4d0a6339b3b91050a8a003b1fa221de10eadfd1f5b8828dced669c1d8 SHA512 2eef6c4d23fccd67abc3647852ca92edd951b4ece8047f28571689a143421c5a1403ef0fcc96615e4ed708df64f7eede643d872fac850554031a17e2d907f398
 DIST qtscript-everywhere-src-5.15.1.tar.xz 2663232 BLAKE2B 3bc0c6bce1f7792fa67cc05f1948b3ca82a4ba5c3166f55860ba83f5b9a352d2eddeb9586a967e02251e1be143b6f1aeefcfd7dca627c207190ab1b39b2f755a SHA512 f97bdf0a3a402f2658d23c92d2f0d916bda68b63f1f140f90cb99176e969736758d50cbdc36c5a4b135b08cb74c117dd92c29bcbb41b1a28189af9180604b8ba
-EBUILD qtscript-5.14.2.ebuild 673 BLAKE2B 66f10b67e1537f458f04eaa08f7e491a34c4933f10d37ef7651523adb57035edb7ac0ca950072e2fbda44663e89cb8e867e3ba903f38dfeee1f4173efb18ad09 SHA512 e34a5fede7ed1bd12b9ac64a8ba33dcc06282eb8917c31ef85d6473c09632ced63c6cd00baf5f50192f6855ea9111f7980f79baee14ed57c24dd682b9bba7998
-EBUILD qtscript-5.15.1.ebuild 678 BLAKE2B 0b449ad3b23cd214f0e96d45aaa95fc5f44d8e3ead2e39f01bea6d04515ff81096e972d7e0c3413096ad3f2b65a455c989bd402be40b4ff116128a7f9599b756 SHA512 e0e26d042129ac2745351dd1680aa96d08be783b06580cce163339aba3d25e483fad6056e8ffcd53d29b20e5dbab530801e5261daef7e5d6219b67a57a44b041
+EBUILD qtscript-5.15.1.ebuild 673 BLAKE2B 66f10b67e1537f458f04eaa08f7e491a34c4933f10d37ef7651523adb57035edb7ac0ca950072e2fbda44663e89cb8e867e3ba903f38dfeee1f4173efb18ad09 SHA512 e34a5fede7ed1bd12b9ac64a8ba33dcc06282eb8917c31ef85d6473c09632ced63c6cd00baf5f50192f6855ea9111f7980f79baee14ed57c24dd682b9bba7998
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.14.2.ebuild b/dev-qt/qtscript/qtscript-5.14.2.ebuild
deleted file mode 100644
index d2aa2181a86a..000000000000
--- a/dev-qt/qtscript/qtscript-5.14.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="+jit scripttools"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	scripttools? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod scripttools widgets \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		JAVASCRIPTCORE_JIT=$(usex jit 'yes' 'no')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtscript/qtscript-5.15.1.ebuild b/dev-qt/qtscript/qtscript-5.15.1.ebuild
index 34b9dbc92753..d2aa2181a86a 100644
--- a/dev-qt/qtscript/qtscript-5.15.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index 7dc549efc850..ba734f4cf56c 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,5 +1,3 @@
-DIST qtscxml-everywhere-src-5.14.2.tar.xz 433268 BLAKE2B 171e4f6f6a97ee673dd985b63d3ecffabda911276f4e916f4a9c63bf1fb4367972f102a1638ded3e26c5fee706ef0391d4cb6eb7aa0823b33670641a9fc2e2ac SHA512 2e1cbea7c32d93675b4a67287dd17c9ed120a6655f8f9a30edfe12a16f67b3c5ad6d0fd04c0102297693bf87e225d81e963534958c8e73622c605388c9fc8425
 DIST qtscxml-everywhere-src-5.15.1.tar.xz 434168 BLAKE2B 7957a43ff527763137dfab45bec9242e8ca9a5d308ab0b7d1d9057f8e362f24ef73de19e61e1301922be87082ca07eda1524704916769875e5ef879710c661d2 SHA512 893c3b247578c330db9b828e28e4df83b0e966bb469f1f453569e0226a8181b642c37f2198ff4194bec7997daee9578bebaaa7166bf1be8b67693edd0fbac082
-EBUILD qtscxml-5.14.2.ebuild 375 BLAKE2B 488f2713fa30213e6bdef1e7b2d01d5f503df83ec1ad4c8db35ba945e642dbfce0277e5eff24c4656b4c40606854f8e3279d917d21ecb2f87effcbafb1e9fc7b SHA512 1048e723e5db13641136f48b75ca2f5a43313f3ad848dbb6a519dca5d145894da16bb5f6b69b0a658c7e3e2678ee47d15dbff1fc9ad3888f59ca991302c1cf5a
-EBUILD qtscxml-5.15.1.ebuild 378 BLAKE2B 3e6955daf78fefac62ca4a03eacd2e7574d07d8d1fecc693787564dac921b182d67c4b175b51a58fa3f7072664444f074209137cc17f71890abb273d7e00a751 SHA512 52dffec83484d799250008f1b4b96be235c81d5ec721507efb821ac8c04cbe65e2699c201302003467b2ddfeef9cddb43d4d8f56630dfd5462b8126c01bd0475
+EBUILD qtscxml-5.15.1.ebuild 375 BLAKE2B 488f2713fa30213e6bdef1e7b2d01d5f503df83ec1ad4c8db35ba945e642dbfce0277e5eff24c4656b4c40606854f8e3279d917d21ecb2f87effcbafb1e9fc7b SHA512 1048e723e5db13641136f48b75ca2f5a43313f3ad848dbb6a519dca5d145894da16bb5f6b69b0a658c7e3e2678ee47d15dbff1fc9ad3888f59ca991302c1cf5a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtscxml/qtscxml-5.14.2.ebuild b/dev-qt/qtscxml/qtscxml-5.14.2.ebuild
deleted file mode 100644
index f85c0919e340..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.14.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtscxml/qtscxml-5.15.1.ebuild b/dev-qt/qtscxml/qtscxml-5.15.1.ebuild
index 470c269e1553..f85c0919e340 100644
--- a/dev-qt/qtscxml/qtscxml-5.15.1.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 1b453c71bf3c..5cfd28724861 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,5 +1,3 @@
-DIST qtsensors-everywhere-src-5.14.2.tar.xz 2050616 BLAKE2B 7a31fc1d57fd925baf8c3fb38477f5888334f64bf08f55ed557db85bca12d6e9d24bbf38e2cad0b74774712a1311a2554c35155507887d7c032d25ae28d47f1c SHA512 43872a51163317c2fb642f59a9e41ede77cb86d7148436d9e673ac94543fb8acffe4e040824dd88a9029943418a3371c77815b82a0a566426857d18fbc23e341
 DIST qtsensors-everywhere-src-5.15.1.tar.xz 2057232 BLAKE2B d4b609db7a73fbaf8cb3da02e34639491a778dab10061de7887bc76f39bcf712d9529fffd1712f94551da350bb9f0f823eac48a6d9be0a4d73e0fe9753bc475e SHA512 ef0757125a6c5b89e206661d1d0e0674b673a81e1a0be1de9de2fdcd701fd507b0b47e1b67be013cbebbf846f593e37e4ef2941dcec4b78028019820d1fe7c3b
-EBUILD qtsensors-5.14.2.ebuild 536 BLAKE2B 48630342602f666f624b5da0ceefbc9c6a9370a044518def4e19a2c68a9ad7210cf3b8b8288d9826382de90ef977fc78adc6c2df0cb3f0ad14ffa3f56cbb2d9d SHA512 4ea9d013e8ac45b0e3bd38a634fb330ea693a88d357b74e24cc5d53c7e08fa5ff6d1a1a83102dc0ef6b5d2f0c66efbcbdab3f440a1c668ff4ffb435f0328728d
-EBUILD qtsensors-5.15.1.ebuild 541 BLAKE2B 5dcd6d002fc93ed5d9b6c16beb21a00232cead61bf2e5ae49764e306836fc64b0339b6b0859534535f74942ce9f1ed3414bd35e44cf50a37413269427747d590 SHA512 56a3f5c768d42c2b3d9e1575ff3477792d255a7cef1969c69317bcebaf82649dba4c31ac1ed64ef1acbfd168173270e4b963eeffdc851d0beeba88a6f96f30e5
+EBUILD qtsensors-5.15.1.ebuild 536 BLAKE2B 48630342602f666f624b5da0ceefbc9c6a9370a044518def4e19a2c68a9ad7210cf3b8b8288d9826382de90ef977fc78adc6c2df0cb3f0ad14ffa3f56cbb2d9d SHA512 4ea9d013e8ac45b0e3bd38a634fb330ea693a88d357b74e24cc5d53c7e08fa5ff6d1a1a83102dc0ef6b5d2f0c66efbcbdab3f440a1c668ff4ffb435f0328728d
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.14.2.ebuild b/dev-qt/qtsensors/qtsensors-5.14.2.ebuild
deleted file mode 100644
index bc68f84ee2a7..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.14.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Hardware sensor access library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
-fi
-
-# TODO: simulator
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdbus-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtsensors/qtsensors-5.15.1.ebuild b/dev-qt/qtsensors/qtsensors-5.15.1.ebuild
index 6780b05a4fcf..bc68f84ee2a7 100644
--- a/dev-qt/qtsensors/qtsensors-5.15.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index db38f83749bd..007bab37704a 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialbus-everywhere-src-5.14.2.tar.xz 349808 BLAKE2B f2c11796e412fef11031ce881c7e6684572bd67f7bccdca1b98a7099d19df57d184ef8b33f5b2df4f516b5922b482dfe32122411c98a6f73fca66104ec70be64 SHA512 c98c7d30dc7f44837a601088b2797bc85d8b659dcdba5f22c229edad0fcee57e38c5b5d55ed223f22c9ce4e14b72ea6e59b920d4f4b366d0381b208e3e9cff40
 DIST qtserialbus-everywhere-src-5.15.1.tar.xz 356308 BLAKE2B 980c78aefbbfae6526d65ddce65276ec03b3c781529938d5a43a8e285dbb6f51412f54d7f9c17d6c4c8db3e9734847c0134805fd45367c39508636fb9c801d91 SHA512 cd7e0d721aa46a59239f44c6b0122509aba2237e0e62ea5399b4d4924601a9def989dd8b5d17fdcc46b41491d582d82b46c7efdfb9277ac1f06da7f1e2a1a859
-EBUILD qtserialbus-5.14.2.ebuild 414 BLAKE2B 1866625b93493ce873ce5f3f3fc0c02e8f62953b8c0d1d5bf009e0d23de8d426457d7ec7772c7fb52d0d7dbf5f63e3995e1745e67159737ecf44be431bf75c99 SHA512 14e4ce2c8eba7e423d0b7240d9f9be7ed1f72b1384409b68103ce84a690e2821893f0c243b451d5da532fb24f7a3eb971ab1684d861009273f41223dbfc8c755
 EBUILD qtserialbus-5.15.1.ebuild 414 BLAKE2B 1866625b93493ce873ce5f3f3fc0c02e8f62953b8c0d1d5bf009e0d23de8d426457d7ec7772c7fb52d0d7dbf5f63e3995e1745e67159737ecf44be431bf75c99 SHA512 14e4ce2c8eba7e423d0b7240d9f9be7ed1f72b1384409b68103ce84a690e2821893f0c243b451d5da532fb24f7a3eb971ab1684d861009273f41223dbfc8c755
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild
deleted file mode 100644
index 2b783f499663..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.14.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtserialport-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index df4958efafde..70992862aef8 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,5 +1,3 @@
-DIST qtserialport-everywhere-src-5.14.2.tar.xz 316492 BLAKE2B 38aaf7053fde382b0b161356fdf9ab97bdf08b6307bb97b704b846dc26a309b1256c6cb53e8caa0207ffb2e174387059debba0f0256f8893f60b1c1fce58fc5a SHA512 4a4fb81bcccaddc5902223940031a9002395cbc5e99c78c1ac5df04031b6a0551bb340757f84bad82ca7ef551358c1eba3a035b0b8f4221f7db0ab738ac65b06
 DIST qtserialport-everywhere-src-5.15.1.tar.xz 321472 BLAKE2B 6aa086b8ec8d79abbf1f428913800a67e1a48fb8629c10058fc464b913f3840a9dc06084bf181749b543f4795400b93f133ffe74cbc546986bf48e01317bb883 SHA512 5d2e9742d1c5f784375b3d0bf05e227abf1f358f4ba60e66044378b60ac256dda2ab5ecced07c68ca8d93fe894617050821654200e1faa12f4cca112a4fbd2a4
-EBUILD qtserialport-5.14.2.ebuild 545 BLAKE2B 82a3262e3a30a69cd5f324305faf5c2bd25df98bbf1899b4d8b3fed700a037be944328c08209a04d292161bdfe029ff6eadcb9522ce52a302d54fd30de9ff574 SHA512 b564c50192987ad7db7e3ec67d4cfc967ec38fcf7bbaa7ac16573027947e9c1f78ab7d91f0b51200cadfb38c96122ab31ee6ac0d74e4a081f147caf5b5dc0d2c
-EBUILD qtserialport-5.15.1.ebuild 551 BLAKE2B 6350ce0559c0fe8bbd286800f537fc75a4acbeb3a66287abacfa48772b2963657a16f1a2178f75a18d66a8b9ba56820d8ffbd00adffd5018c5c1d54dc5d083be SHA512 8e19ac9c8b00974f144ed31c1540cf5c78aefbc6e1eba6df609b6a0a85ac4c78fc95399689c28394e998ed90247b4f5f4623edb33f9cf737864fef6658013554
+EBUILD qtserialport-5.15.1.ebuild 545 BLAKE2B 82a3262e3a30a69cd5f324305faf5c2bd25df98bbf1899b4d8b3fed700a037be944328c08209a04d292161bdfe029ff6eadcb9522ce52a302d54fd30de9ff574 SHA512 b564c50192987ad7db7e3ec67d4cfc967ec38fcf7bbaa7ac16573027947e9c1f78ab7d91f0b51200cadfb38c96122ab31ee6ac0d74e4a081f147caf5b5dc0d2c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.14.2.ebuild b/dev-qt/qtserialport/qtserialport-5.14.2.ebuild
deleted file mode 100644
index 23658e243ffe..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.14.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Serial port abstraction library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	virtual/libudev:=
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# make sure we link against libudev
-	sed -i -e 's/:qtConfig(libudev)//' \
-		src/serialport/serialport-lib.pri || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtserialport/qtserialport-5.15.1.ebuild b/dev-qt/qtserialport/qtserialport-5.15.1.ebuild
index d510efe398ec..23658e243ffe 100644
--- a/dev-qt/qtserialport/qtserialport-5.15.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest
index 7c022815f471..007f5d61a80e 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,5 +1,3 @@
-DIST qtspeech-everywhere-src-5.14.2.tar.xz 101100 BLAKE2B d37d08a2f7e6d40c7f6e68f9c4e301cdf9762ad9088a3fa0f9568af7211a2842b035e8f5eb001538aaa84385104d112cd6e550e32119099acee922f2dd13db36 SHA512 d3870cc66cba4f5dd2c0a2a4845defe4299de2d7affe12ccdadc4948116317590b580592d575cc5e8eb190043a92f38416e030f47cfb87f5cf3419a31152e00f
 DIST qtspeech-everywhere-src-5.15.1.tar.xz 101772 BLAKE2B 8a61ff9d5b0ba33ef3c82e26f3e4ae91ff0a6af848ae2bd26c0f0850cab0cbc701698c712e528cb6bb9a66ac699519f8235cb2c62edabc4506bf397ca747401c SHA512 0e2c82ea72b5bff5b36f3d833d80dec68b39f3b9c3ca4d9c9fa29f0419a45dfb19ac59fb105136c551f6bbe60ad32af0f4aaa6abafb5bc61bc5d85ecb94b326f
-EBUILD qtspeech-5.14.2.ebuild 440 BLAKE2B 96b4f7a9025b5a9635b5fe07c998a2a16b4547df7ee0738d092cf26de9ac5683ea21c1c1493a8366efc56131883a3ea4d37d84e7f32edef556eab86445f283ac SHA512 24d61a8707bddedd9dee8d1d76ff3a868505280115f62e264f9677a8c0b99306366f2672cb0385b878a3e74c26e973e8d03ed9b5f08de7f9b3f0784defb93bd0
-EBUILD qtspeech-5.15.1.ebuild 443 BLAKE2B 01cc92ada40c606dd525c64c2204527cf5f9ecea3a56ec9c78b44732e57566e0cf91ee933d1589c20a1ffeefb77fdb46a50521b846f18c8dda2336ff0fb4f252 SHA512 960505cf48951041c7ea2cd4a70e9ff7efd8cace21c5b64923cbba26815a0cdc2cf2f1472546000a1ff8ef5bc25902629861b161c932e6bb98d48e0daa652987
+EBUILD qtspeech-5.15.1.ebuild 440 BLAKE2B 96b4f7a9025b5a9635b5fe07c998a2a16b4547df7ee0738d092cf26de9ac5683ea21c1c1493a8366efc56131883a3ea4d37d84e7f32edef556eab86445f283ac SHA512 24d61a8707bddedd9dee8d1d76ff3a868505280115f62e264f9677a8c0b99306366f2672cb0385b878a3e74c26e973e8d03ed9b5f08de7f9b3f0784defb93bd0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.14.2.ebuild b/dev-qt/qtspeech/qtspeech-5.14.2.ebuild
deleted file mode 100644
index ce5caf530389..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.14.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Text-to-speech library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-# TODO: flite plugin - needs 2.0.0 (not yet in tree)
-IUSE=""
-
-RDEPEND="
-	>=app-accessibility/speech-dispatcher-0.8.7
-	~dev-qt/qtcore-${PV}
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtspeech/qtspeech-5.15.1.ebuild b/dev-qt/qtspeech/qtspeech-5.15.1.ebuild
index 12d0485fe59b..ce5caf530389 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.1.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index c9b0c140267c..f95037838f77 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtsql-5.14.2.ebuild 1239 BLAKE2B a65b09ed09699d01364d43f487323b0ef5e1c58a607c6e7e533672fbcf8c0ebf5f4269e319b667e46993950656686f8f6cb53d9e9e508fdab9e8e4711b832d30 SHA512 1aff70d3a2c73024c88c51d9ba523f47031b1c66dfda7b62aeb7267018b4e9f6fb22ac067f11fad84eea917badba57c4563b0a1902df825905a9ecc96a28e1cf
-EBUILD qtsql-5.15.1.ebuild 1245 BLAKE2B b2306d8520913bc9532e8e3c1913dfc54afd485e670fa2f556d02fbe8ae11bb33e53cbe98fbe897f9be6b6031b1b5c894f24430cd9c58d984b2e3f5a2a5978c2 SHA512 2b3fd69def9c1c24f672f78600daf57d1f85f5f0f4971b6488d280f9318cd182fde889040ecc883888fc2d0675499baccc5d615f1e40c39a9df34c6388fd9d3a
+EBUILD qtsql-5.15.1.ebuild 1239 BLAKE2B a65b09ed09699d01364d43f487323b0ef5e1c58a607c6e7e533672fbcf8c0ebf5f4269e319b667e46993950656686f8f6cb53d9e9e508fdab9e8e4711b832d30 SHA512 1aff70d3a2c73024c88c51d9ba523f47031b1c66dfda7b62aeb7267018b4e9f6fb22ac067f11fad84eea917badba57c4563b0a1902df825905a9ecc96a28e1cf
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/qtsql-5.14.2.ebuild b/dev-qt/qtsql/qtsql-5.14.2.ebuild
deleted file mode 100644
index 3b493c72fbbb..000000000000
--- a/dev-qt/qtsql/qtsql-5.14.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="SQL abstraction library for the Qt5 framework"
-SLOT=5/$(ver_cut 1-3) # bug 639140
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	freetds? ( dev-db/freetds )
-	mysql? ( dev-db/mysql-connector-c:= )
-	oci8? ( dev-db/oracle-instantclient:=[sdk] )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql:* )
-	sqlite? ( dev-db/sqlite:3 )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/sql
-	src/plugins/sqldrivers
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:sql
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use freetds  sql-tds    plugin)
-		$(qt_use mysql    sql-mysql  plugin)
-		$(qt_use oci8     sql-oci    plugin)
-		$(qt_use odbc     sql-odbc   plugin)
-		$(qt_use postgres sql-psql   plugin)
-		$(qt_use sqlite   sql-sqlite plugin)
-		$(usex sqlite -system-sqlite '')
-	)
-
-	use oci8 && myconf+=("-I${ORACLE_HOME}/include" "-L${ORACLE_HOME}/$(get_libdir)")
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtsql/qtsql-5.15.1.ebuild b/dev-qt/qtsql/qtsql-5.15.1.ebuild
index 4853177b0b96..3b493c72fbbb 100644
--- a/dev-qt/qtsql/qtsql-5.15.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.15.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="SQL abstraction library for the Qt5 framework"
 SLOT=5/$(ver_cut 1-3) # bug 639140
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtstyleplugins/Manifest b/dev-qt/qtstyleplugins/Manifest
index cd8d50d97864..2a28a9b16cc9 100644
--- a/dev-qt/qtstyleplugins/Manifest
+++ b/dev-qt/qtstyleplugins/Manifest
@@ -1,4 +1,4 @@
 AUX fix-build-qt5.15.patch 2651 BLAKE2B d4b058715e76f2721bd39c6499289b959daabc1ec765af1a87d0796eb934a49bfd589816dbfba6e374c5cd61a3d3b2526f25de21108fe6a0a7f352f57e899e5a SHA512 181bf85ad054ed5788f1bd4c32116729d57f83b8a4fdfcab3d3185ccd1e557b9492468c11c53a8a54c858967bf8298c3bd1a29bc100a8ffc6561ec543361f8b5
 DIST qtstyleplugins-5.0.0_p20170311.tar.gz 306394 BLAKE2B a59343602062ec1d0f215acf568322a5be874552b0c03dec75f268cec2123b1baa30bee524e36c9d522a8c935a58f204b5362feaf028df87ca10ea01dd29b3fb SHA512 e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d
-EBUILD qtstyleplugins-5.0.0_p20170311.ebuild 872 BLAKE2B 27908a1ea8fd57125848ef5d00ae64e2f7dfa3808bb11ac9b7978a558b0b0b374161f09a0b4226d2c19ca7a00584c3baef9e2904350e919452c3a937f3d03676 SHA512 2a65d2b594c62f7e5c65a7393da920ac942a1c281092b01310b0f6d0ff6454ebcbd4a4a426b86a732492001e0573e9a0d7b7f119193c617d45b410b63c3a1adb
+EBUILD qtstyleplugins-5.0.0_p20170311.ebuild 882 BLAKE2B 3da9cd094b85c4f9ae4a7a46bc07165c730fa5c92780712ea569ac7fbf88257afbd34c38512baea84786edd936cd028ce9bf20cc56f2de992fe9f8819e6e7c6a SHA512 597e0ae8b1b5b6db00664282d0d3e94a8fef85561f94284dd45778101a9ec8523f6981883d5c801d5a916314f81ed4e6fafaf95b42d46b62425638eb8ba41ee9
 MISC metadata.xml 329 BLAKE2B 0b6512d88b304129461ebe5d0bd6c138528a7d0379a7407736b1d82de2266c265adcfee0ef077a6d2fdf0a5588d6758f2af4c31d6c5a4369b437dee302b14c8e SHA512 be6bd88cfb8875c8c07782b217f4701b2b325199d51e928ea9c4fa45a09dd7e69e04a1f314fc8c0301c5efa1a2ee8e2cda8d276108b5ff3c6de46ec5e3bb5ba0
diff --git a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
index 24e7e83cdc2f..b9c249781d39 100644
--- a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
+++ b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild
@@ -7,7 +7,7 @@ inherit qmake-utils
 
 COMMIT="335dbece103e2cbf6c7cf819ab6672c2956b17b3"
 DESCRIPTION="Additional style plugins for Qt5 (gtk2, cleanlook, plastic, motif)"
-HOMEPAGE="https://github.com/qt/qtstyleplugins"
+HOMEPAGE="https://code.qt.io/cgit/qt/qtstyleplugins.git/"
 SRC_URI="https://github.com/qt/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="5"
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 832f3baa9dbd..95da92d73c14 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,5 +1,3 @@
-DIST qtsvg-everywhere-src-5.14.2.tar.xz 1880100 BLAKE2B 285732e614c5aaf3a4ddb644cdfb3cd35708985d79d6ab3aa5917fde35d43fd656b5c6fbc5f08764b6413e5f0aa8919f70966791ece15fbb2d96c38b9575e27b SHA512 b4cf8a7081e01caea3c71826d32ebb9da6a71bd4eab3cf353e87080009065aff2c533300c0c08a005ff8f441d2da641a097319114a5c11b618398fac41f574a7
 DIST qtsvg-everywhere-src-5.15.1.tar.xz 1885556 BLAKE2B b17906bce25066581fa4f53c4b35dad918da737fec8a966c891a150a242a787f231619fa6b1a303d02edfd7cde4a977fc3c0f94eb993bef56e4dfdee81892f20 SHA512 c0289bbce4682eef9cd87811ad11a4ce2141cb89bd026f9cc595123e6b4ebbe9e81a91b54bcf25fbf4225bc66e8a5e4f49e4fabde43e9da066583f22aab4f35f
-EBUILD qtsvg-5.14.2.ebuild 451 BLAKE2B d154e4b78c680657d6f216ace6bdbc319558e8517244ab2bb52b25e988507b8f7440464954e4bba9d392645ddd1d8a981f1810abd9ec649436c1d626b6bb8129 SHA512 15f4a361304656857c069370ea9807268f9176a38c085cc2ae728081d782e2b6c7f58dc41806ce2ae8a7bfef135c5cf96861b3651620cf2b3f59e6cd78f7e320
-EBUILD qtsvg-5.15.1.ebuild 457 BLAKE2B 6465e3adcb5719db36899e6a68af8f3dde1e6ae72b321f845bc78c46e6533f334dea6ef7e5863b4d55fd2c9e1a724844e864728064c6f63ddb6221732650e5b3 SHA512 21de92c7242d66faa1fcb8fb1d3624b3769803147c2d5edce05a03fb745c26a37b5a4c96a9a153e19645d6d41519adaf86a5f10a2d3e29a8cfd31d0198b1a49c
+EBUILD qtsvg-5.15.1.ebuild 451 BLAKE2B d154e4b78c680657d6f216ace6bdbc319558e8517244ab2bb52b25e988507b8f7440464954e4bba9d392645ddd1d8a981f1810abd9ec649436c1d626b6bb8129 SHA512 15f4a361304656857c069370ea9807268f9176a38c085cc2ae728081d782e2b6c7f58dc41806ce2ae8a7bfef135c5cf96861b3651620cf2b3f59e6cd78f7e320
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.14.2.ebuild b/dev-qt/qtsvg/qtsvg-5.14.2.ebuild
deleted file mode 100644
index 558cc0f0b7f6..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.14.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtxml-${PV} )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.15.1.ebuild b/dev-qt/qtsvg/qtsvg-5.15.1.ebuild
index 9584f7c08b50..558cc0f0b7f6 100644
--- a/dev-qt/qtsvg/qtsvg-5.15.1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="SVG rendering library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 85996c8f2097..b99f3c692c97 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qttest-5.14.2.ebuild 538 BLAKE2B a54ae313c9ef16001a6b8d5d0d7ef11d0d55c3bb67789192b849a89e9dbbc713534b20819709ec1c22562df3a2039e4abebb535a60938bdd4e63bf93d2509d43 SHA512 71d8910554b8e3ea421a47c35487d1ab560ceb66c7d3757016004ba01d642431c36dbd7c1c97e2bf63cbd8d45a8b91b5bb9119ad340309f95c2380f8663035b9
-EBUILD qttest-5.15.1.ebuild 544 BLAKE2B 745af979b2651358e3184e953260b736c9a0231b427bc9a0fe540421e68dda5e1dd95fe4c892f6c311b44b963c7cd6ee2ef244bc08fdef117e0f9dc81fedd5f5 SHA512 f78087bcf51747557cf3c0299638981958bf4503edc9ed97a0c479a836655814d48b2f78d18fdd10f05db661b33a63915b746422dc53eb6669d2c3d1ad54d1aa
+EBUILD qttest-5.15.1.ebuild 538 BLAKE2B a54ae313c9ef16001a6b8d5d0d7ef11d0d55c3bb67789192b849a89e9dbbc713534b20819709ec1c22562df3a2039e4abebb535a60938bdd4e63bf93d2509d43 SHA512 71d8910554b8e3ea421a47c35487d1ab560ceb66c7d3757016004ba01d642431c36dbd7c1c97e2bf63cbd8d45a8b91b5bb9119ad340309f95c2380f8663035b9
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.14.2.ebuild b/dev-qt/qttest/qttest-5.14.2.ebuild
deleted file mode 100644
index 25b708984fb2..000000000000
--- a/dev-qt/qttest/qttest-5.14.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Unit testing library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-DEPEND="${RDEPEND}
-	test? (
-		~dev-qt/qtgui-${PV}
-		~dev-qt/qtxml-${PV}
-	)
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/testlib
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:testlib
-)
diff --git a/dev-qt/qttest/qttest-5.15.1.ebuild b/dev-qt/qttest/qttest-5.15.1.ebuild
index f73f2420fd6b..25b708984fb2 100644
--- a/dev-qt/qttest/qttest-5.15.1.ebuild
+++ b/dev-qt/qttest/qttest-5.15.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index 47bfd4fa790e..2c96a17eabeb 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,5 +1,3 @@
-DIST qttranslations-everywhere-src-5.14.2.tar.xz 1348684 BLAKE2B f72cb65813c9b21d57eb6673d193fd6f67d65ced740622567b39333714a8491e3ffa2edd729aba917fae8883d693fbd68c567ca03cd243ea734804e1862b4794 SHA512 38cedf19a1d7b920b7dcfcc014d3986c4067dafd7192efe43c3b8f282e0637391f9ec0b8cc7f5506cc76629d005298becba1421506b48c6baf3366ec2f378544
 DIST qttranslations-everywhere-src-5.15.1.tar.xz 1419252 BLAKE2B 80656f949a8a408953169e9fb611887a73f302025a8411cddce40956b72fd4ac7bfb580fa37c2e932a5f7fe1388503bb30117b675cf65a8c7eee301a766bbfce SHA512 8e9fe7614c9aa9c557db1bfd6a0ceae90b45e5d28e0cd715fd4ad962b9fbfa722549d6c2a13d82deebd7d3fab7e68cc7affd207beb75629de0d01a5522035581
-EBUILD qttranslations-5.14.2.ebuild 372 BLAKE2B 5e6cfd03be2e8893c066509996ac0f14ce50a2b290d6649027115af696c9c5375b03c74deba0ebbc736a7db27dd4b3f4b6e442111cc9140a0fa6abff1696cf7e SHA512 6cbd2ced696e138b2aa0d48d08c6823d3d7a776f23476bd0968749775dbab0a093d216fcad8c527a468db408ded82f61eea1e11bd364ca885393b1b7da3263b4
-EBUILD qttranslations-5.15.1.ebuild 378 BLAKE2B 0d7d779be190e94f2013cdc097ee2376f828c846570b9b06bfc81d7248e4978af2029efb2e04b9c8c57ac309597de630fd6600828d0ab81928c7434f77f1dbbe SHA512 30ecccf1ab074aee9284a7dfb256b8f82a7eb73877d6c0a0e39265ba42c40c87bd0fbc63f56fc7ebc5fdcdae60a7dec147fe442ce64d17e6ab85ff58c6628e0a
+EBUILD qttranslations-5.15.1.ebuild 372 BLAKE2B 5e6cfd03be2e8893c066509996ac0f14ce50a2b290d6649027115af696c9c5375b03c74deba0ebbc736a7db27dd4b3f4b6e442111cc9140a0fa6abff1696cf7e SHA512 6cbd2ced696e138b2aa0d48d08c6823d3d7a776f23476bd0968749775dbab0a093d216fcad8c527a468db408ded82f61eea1e11bd364ca885393b1b7da3263b4
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.14.2.ebuild b/dev-qt/qttranslations/qttranslations-5.14.2.ebuild
deleted file mode 100644
index 762a128712ec..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.14.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Translation files for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qttranslations/qttranslations-5.15.1.ebuild b/dev-qt/qttranslations/qttranslations-5.15.1.ebuild
index b882082d4fe2..762a128712ec 100644
--- a/dev-qt/qttranslations/qttranslations-5.15.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest
index 8e10ea010efb..54980e4f086f 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,5 +1,3 @@
-DIST qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz 10957372 BLAKE2B 9fc84f0ee58a235e7a6291030ce8c8f9271789b7f62bd39b9fd9d0f23a47703c147c388ea89187527ba60902e03c0a145291c3ead1a185d3e771a982ce4c0430 SHA512 752634de8796a1809818176db47021aa24de842cf6334d689a91d3b011105a5e2b8113615a8f50f6974bf8fa989026b434121b42278de1ef905075ba3ee72c47
 DIST qtvirtualkeyboard-everywhere-src-5.15.1.tar.xz 10969980 BLAKE2B 8f645c22e7fa48f967b72cd66af5658f9ddf119cdf66b7acac9cc4ac6b26b45e461960c1987936a872dff093949f305c65ba0a3009cfbf22fcd73e0443e97e92 SHA512 f369eb0c313aa5a932cacca44f93732f8a7b8de4bf46df294c40b7c7dd436d5da5012680420306b57347aa38a10d78231199093a10e2b8a272429536a327962e
-EBUILD qtvirtualkeyboard-5.14.2.ebuild 1201 BLAKE2B d201ef8f92d1649837343c87c22cdfdc78cd2c2612ec39c4a73d73a8d5d537d7f43f0c8b47c7ce9ddc32403e287e420db4329a0b3467a36ae9e964df5014089d SHA512 e88986a762232a2db2081588a3b09ff6a8138e438ec2a8331710ccc99ca9321d8285c5ab1e7b560026a2ab72e50b3da0677d07906fe818f79a4cc0795d9155d4
-EBUILD qtvirtualkeyboard-5.15.1.ebuild 1204 BLAKE2B 4d949aa5df208fc05f2bacddb224b288bde6bfcf64f6d4ccc26a511645f39fd4e29694376fba343123d1dfc966b6918ddf1c8ae7dd9b9b4d7923b74c61fb7721 SHA512 9546e67d4f5ccfbbe17c76a21a0e67959f6872a1c1550113b8dd7cb7e2d485cf048e52b52ad4577f3bcaeb544bca7040eadb8d67009e5129ac0552dccd72ce77
+EBUILD qtvirtualkeyboard-5.15.1.ebuild 1201 BLAKE2B d201ef8f92d1649837343c87c22cdfdc78cd2c2612ec39c4a73d73a8d5d537d7f43f0c8b47c7ce9ddc32403e287e420db4329a0b3467a36ae9e964df5014089d SHA512 e88986a762232a2db2081588a3b09ff6a8138e438ec2a8331710ccc99ca9321d8285c5ab1e7b560026a2ab72e50b3da0677d07906fe818f79a4cc0795d9155d4
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild
deleted file mode 100644
index 2bab20a97453..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.14.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	X? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit '')
-		$(usex spell '' CONFIG+=disable-hunspell)
-		$(usex X '' CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
-			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
-			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
-			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
-			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
-			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
-			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
-			lang-uk_UA lang-vi_VN"
-	)
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.1.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.1.ebuild
index cf38d8e0bbbd..2bab20a97453 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.1.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 9cbdac308f85..de06a596571d 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,5 +1,3 @@
-DIST qtwayland-everywhere-src-5.14.2.tar.xz 544532 BLAKE2B 13cf07116737ec2fd301f51f517cbc062fdd42b800d6d2739193f3570f1a9552e66e9909de15c22cc530d5284c3be9ff24915ce4b36f529ec6c22faeb0edff58 SHA512 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899
 DIST qtwayland-everywhere-src-5.15.1.tar.xz 563508 BLAKE2B 507e8612a35c6439fab0637edfcae95d712daf19c0a8b97110b57b8a8ffd70374addc3ef19f210eedc9493d84ec441f18bd0fd5a25af5394fde40ee55573eb09 SHA512 d6619f35b3ab163372a0d49a2221c487d5936b6d9ebeb92a7fd41521c424d550eea7c5c584e07f15bde1ec5ece1bd5774845eb9956ce793e546197ffdb28d594
-EBUILD qtwayland-5.14.2.ebuild 920 BLAKE2B d4d3dc9d606892dbd54696d538778db62f17419d52837137463983436efe73aadcae87939d8a98b038bcd10f3335b28699207cb0c8368b77bdda695eceede277 SHA512 7d5f7b6b6e73a9ec6e72a8102b01b9ca15021843846de1dd68e7a37a16c31d2f9b8de32601471a6146f1c9286b5b881af7ec8079999e20c99aa015b25d7931cc
-EBUILD qtwayland-5.15.1.ebuild 836 BLAKE2B 1a24a6ae4ffcd8a3e87b43dc21f6e465b0c83a4dc00d24cb2bf76f0124d29cd2caecb1d367d3d10eeed6cad9f44db4b520d3a25ed226bad783c607c99ddf28e2 SHA512 3a1eae3e8b807816c5ea20a8afd3db7906d39f0ff7906c352598c405cb458dda8c7c9c67e3bd0890eb0276f87d4133a651f1bb2ef569acd1fa9c81259b440c57
+EBUILD qtwayland-5.15.1.ebuild 830 BLAKE2B c4c4d0bdf3f694158e36f4f4d5ddf6190efb5c45a7aa4d8d65f12ddeb0adc777d8a01cdb667b9f08f4ab72dd9c6d0038ee5bced396ac90b16013af28369cfb6c SHA512 378a00c2d6ce25b4abbfb08bbaddb1361c0d79090239ff6de2408aaceb27cb8268f991c29f69b7de9db44ebfea166813ac996cc0339f2b2e4cd2ec5097af0d50
 MISC metadata.xml 583 BLAKE2B 2f04d6e39831120e7a38de5172b26f29bdb19e4677588595e5281000b14dc5ebcc0984fde5e99330807f8c400b7abb3c0cfbdaa7f131c815d60680259532cd3a SHA512 3b76305c692c7e9b2f0d82862ced25a4a306fc23611f7c22dfed3b19d55072373cca7bf2d4e6bfc14276986082cebfe19e7637c780acde1f421bb1baaf95f27a
diff --git a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
deleted file mode 100644
index 144ebd6f0d8a..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Wayland platform plugin for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="vulkan X"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput,vulkan=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	vulkan? ( dev-util/vulkan-headers )
-	X? (
-		~dev-qt/qtgui-${PV}[-gles2-only]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	use X || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use vulkan feature-wayland-vulkan-server-buffer)
-		$(qt_use X feature-xcomposite-egl)
-		$(qt_use X feature-xcomposite-glx)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.15.1.ebuild b/dev-qt/qtwayland/qtwayland-5.15.1.ebuild
index e292407158a9..dcf9a905144a 100644
--- a/dev-qt/qtwayland/qtwayland-5.15.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Wayland platform plugin for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="vulkan X"
diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest
index 85ce67465ae8..68d2bf3790db 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebchannel-everywhere-src-5.14.2.tar.xz 202592 BLAKE2B d65dadcc93c02d1a4d8bee81371a79037054442c153cd4e24d04df1052d654204fd8bf3cb17aada35b2627ac5221b840af58e3fd7f58cda45c0a3eee97308d63 SHA512 57080c8cf7fb5c91fa6b325566d3fb2dc3c1d3bcd8128d2a40ea92f8bae7ca0f0fb4bac1d68452998a5dc06781155058d149df069fed5ff16b6d8ad43a72e002
 DIST qtwebchannel-everywhere-src-5.15.1.tar.xz 208872 BLAKE2B 14899ca0f65eafd69c0b7610035c7b1de6d2c033a4929a49b3898a16aea2eada812d4ebd343f7581eebd5df5e649c9cb7f62c2b9287d24fcbfc7c82600dfaf27 SHA512 01f37630ce7aa32726831b4a4d5e52e861269e33efd89246770e8a2a5536be976601d055c95f99d45699ea918ac4ce465b9ffab725f39841ddc5d320817c7523
-EBUILD qtwebchannel-5.14.2.ebuild 564 BLAKE2B 95d07e8bbcea5bbc440be424158575e6b63dae797bf25d1b996ad41d63aa836e46f32f91de073d1b1e474bf6eac3248c9478e01e25afbed508a57cf17cba76d2 SHA512 281f6f5aa2684f676bbf06cc10188789ea576cc13f896e619bfd656937f34bebc791b13924d51b00ae728d543d17caae9d862e899b9f2314fe18a28f0204bd48
-EBUILD qtwebchannel-5.15.1.ebuild 569 BLAKE2B bb9178f2a14447d0140d04edda6b6a2dfdba9b6f049fe5df3878884242ec195f21c8854dda23303067f225cfc4970cbde6e2bf81285943cafbe6cf356f497711 SHA512 2293a80586cf32498ffaeab853e6010a8ff0a3cd2d89132912a39b1439f4f6ee576a44a9ef16de739ccdaf16af5cae9673c1553891ce77737d4f33d9596b1b71
+EBUILD qtwebchannel-5.15.1.ebuild 564 BLAKE2B 95d07e8bbcea5bbc440be424158575e6b63dae797bf25d1b996ad41d63aa836e46f32f91de073d1b1e474bf6eac3248c9478e01e25afbed508a57cf17cba76d2 SHA512 281f6f5aa2684f676bbf06cc10188789ea576cc13f896e619bfd656937f34bebc791b13924d51b00ae728d543d17caae9d862e899b9f2314fe18a28f0204bd48
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
deleted file mode 100644
index 8e07b74973bc..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-	qt_use_disable_mod qml qml src/webchannel/webchannel.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
index 6d9ff18316c6..8e07b74973bc 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3258d161033f..1ec2c5d4394e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,11 +1,6 @@
-AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86
-AUX qtwebengine-5.14.2-gcc-10.patch 3616 BLAKE2B 079a8ef993b793ddb45a4ff5e3f579f7c4276c122c5c25610a0833e10f870e96282bd5add4e42f4cfa34f023eda04f368b3360ae84342340985b0a605d5ff3f3 SHA512 6c8136c4d6d37a57a1df966f6da18d63599e20e5e78c9fd8b887c689d69306acb33a82f8b7c0f189cda94af7b89318b68f8c647ef78abf0ab8fe83f6c41dae18
-AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
-AUX qtwebengine-5.15.0-bison-3.7-build.patch 1996 BLAKE2B e84c0d29023d13f348d452847e634d58679d47ed45c58991b4007829c1a547b36f9c19b8e188a83a9b2e9bb4fec3a1e8a3b4139ac0300a21a1fb52ce0f024fc1 SHA512 b4d1cfb77ba7a04a7df325468f52d3267891a1edd93ed5b2e8bcc3ef931b198a0ea3bba88d80bf2d235636650dc88f32bfdadcb9c62fbbde245636c9b1c02bef
 AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
+AUX qtwebengine-5.15.1-icu-68.patch 11095 BLAKE2B e493a91a340a18a485eae80e65e74086ec708b72cc8aea4dcb9deebd3722128c7c5e68a9eef7c405912112d6fc29e187df9c8b9a95c5ab0827dc21beba072c1e SHA512 2f3ea6491575faa9af290392ddb5e03687819c424556def82c70a7a4b7bb2e4e099293aab347790035bcf40391789caaea4af7db9cf6733f64f26fdba51288e4
 DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
-DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
 DIST qtwebengine-everywhere-src-5.15.1.tar.xz 278488056 BLAKE2B f369e435510644b36a7305a1a2b907f09f533f995c0c1a367a801cb9f277f66914f4511f20926ed4c865e9e5ec921c12d4406191706d263320a861250cebb3a0 SHA512 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4
-EBUILD qtwebengine-5.14.2.ebuild 4561 BLAKE2B bd75d1b9b144a437bf093d342dd2d4765d100269290d80c3cb796a4bc07a9dd136020250e21039bc8f7522ab4363e9337badce7425e1f5f09376357df1097a74 SHA512 f790d1037dbc663108b5a0412b31c1602346ab945518e0a1b6f0973c4437fa8b5d2afd13d42d7aa733ae9ae3a70211e980dc164e6a77d378e02a0c2db101aef1
-EBUILD qtwebengine-5.15.1.ebuild 4652 BLAKE2B c6027e6c800d954ca0d9d9d7f3c1aa961a8a431f33f4bf23c774ec51513e2996a5bca2c390a6e201f30953193288ebbe85129879d57b7ac5eb4b0faee232379e SHA512 e3fae1620f21461b3bfe7af671c8cdf8e170bfaca7403ba042f6e030764fbe69d0fa8056c69e49df0d80fe7cf5ad1bc697eeada7c37dceb72b805970611c5952
+EBUILD qtwebengine-5.15.1.ebuild 4699 BLAKE2B e9f480e98756f802987a7befeb2aafa0651416786586f6d6f4cf130e5bf02e3df894db02d599b86f5bd5aec55262632ec9873c59bd4e7977b441bec44c6a7ef0 SHA512 0ee21b4ca87663c14a7e1f3804c972a0374de3089df265235bad839bec234d476c102173bfb1889f2acf21d49407c5eb47e8fe3c15d7b7558a850490fc4261df
 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
deleted file mode 100644
index 40f1f5d6c2a9..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/buildtools/config/common.pri b/src/buildtools/config/common.pri
-index 97d3953..dd3d222 100644
---- a/src/buildtools/config/common.pri
-+++ b/src/buildtools/config/common.pri
-@@ -25,6 +25,7 @@ gn_args += \
-     v8_use_external_startup_data=false \
-     toolkit_views=false \
-     treat_warnings_as_errors=false \
-+    fatal_linker_warnings=false \
-     safe_browsing_mode=0 \
-     optimize_webui=false \
-     forbid_non_component_debug_builds=false
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
deleted file mode 100644
index 5df71a602527..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-gcc-10.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From cf83347e6fa9c086b5df022d23ca666245bf1989 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Sun, 10 May 2020 06:02:59 +0300
-Subject: [PATCH] Fix build with GCC 10
-
-Change-Id: I733b8e8a00c49766effbee08c8b1f6f5d31a2dbf
----
- chromium/base/trace_event/trace_event_memory_overhead.h          | 1 +
- chromium/media/cdm/supported_cdm_versions.h                      | 1 +
- .../third_party/perfetto/include/perfetto/base/task_runner.h     | 1 +
- chromium/third_party/webrtc/call/rtx_receive_stream.h            | 1 +
- .../webrtc/modules/audio_processing/aec3/clockdrift_detector.h   | 1 +
- .../third_party/webrtc/modules/video_coding/decoding_state.h     | 1 +
- 6 files changed, 6 insertions(+)
-
-diff --git a/chromium/base/trace_event/trace_event_memory_overhead.h b/chromium/base/trace_event/trace_event_memory_overhead.h
-index 69468d46409..e10a3eca667 100644
---- a/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-+++ b/src/3rdparty/chromium/base/trace_event/trace_event_memory_overhead.h
-@@ -8,6 +8,7 @@
- #include <stddef.h>
- #include <stdint.h>
- 
-+#include <string>
- #include <unordered_map>
- 
- #include "base/base_export.h"
-diff --git a/chromium/media/cdm/supported_cdm_versions.h b/chromium/media/cdm/supported_cdm_versions.h
-index 3f220da8c71..c54e3bb7d30 100644
---- a/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
-+++ b/src/3rdparty/chromium/media/cdm/supported_cdm_versions.h
-@@ -6,6 +6,7 @@
- #define MEDIA_CDM_SUPPORTED_CDM_VERSIONS_H_
- 
- #include <array>
-+#include <cstddef>
- 
- #include "media/base/media_export.h"
- #include "media/cdm/api/content_decryption_module.h"
-diff --git a/chromium/third_party/perfetto/include/perfetto/base/task_runner.h b/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
-index cf60401238f..ee4ad255dea 100644
---- a/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
-+++ b/src/3rdparty/chromium/third_party/perfetto/include/perfetto/base/task_runner.h
-@@ -18,6 +18,7 @@
- #define INCLUDE_PERFETTO_BASE_TASK_RUNNER_H_
- 
- #include <functional>
-+#include <stdint.h>
- 
- #include "perfetto/base/export.h"
- 
-diff --git a/chromium/third_party/webrtc/call/rtx_receive_stream.h b/chromium/third_party/webrtc/call/rtx_receive_stream.h
-index 8ffa4400a9c..66cc46dc091 100644
---- a/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/call/rtx_receive_stream.h
-@@ -12,6 +12,7 @@
- #define CALL_RTX_RECEIVE_STREAM_H_
- 
- #include <map>
-+#include <stdint.h>
- 
- #include "call/rtp_packet_sink_interface.h"
- 
-diff --git a/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h b/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-index 22528c94892..69e624e8b19 100644
---- a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/clockdrift_detector.h
-@@ -12,6 +12,7 @@
- #define MODULES_AUDIO_PROCESSING_AEC3_CLOCKDRIFT_DETECTOR_H_
- 
- #include <array>
-+#include <cstddef>
- 
- namespace webrtc {
- 
-diff --git a/chromium/third_party/webrtc/modules/video_coding/decoding_state.h b/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-index b87fb2d0345..e6c5e2855de 100644
---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/decoding_state.h
-@@ -13,6 +13,7 @@
- 
- #include <map>
- #include <set>
-+#include <stdint.h>
- #include <vector>
- 
- namespace webrtc {
--- 
-2.26.2
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
deleted file mode 100644
index 42ee5e87da26..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
-From: Ujjwal Sharma <ryzokuken@disroot.org>
-Date: Wed, 22 Apr 2020 12:20:17 +0530
-Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
-
-Original commit message:
-
-    [intl] Remove soon-to-be removed getAllFieldPositions
-
-    Needed to land ICU67.1 soon.
-
-    Bug: v8:10393
-    Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
-    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
-    Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
-    Commit-Queue: Frank Tang <ftang@chromium.org>
-    Cr-Commit-Position: refs/heads/master@{#67027}
-
-Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
----
- common.gypi                             |  2 +-
- src/3rdparty/chromium/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
- 2 files changed, 38 insertions(+), 36 deletions(-)
-
-diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc
-index 92d3e2fb82e..ced408aa173 100644
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
-@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
- }
- 
- namespace {
--Maybe<icu::UnicodeString> IcuFormatNumber(
-+Maybe<bool> IcuFormatNumber(
-     Isolate* isolate,
-     const icu::number::LocalizedNumberFormatter& number_format,
--    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
-+    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
-   // If it is BigInt, handle it differently.
-   UErrorCode status = U_ZERO_ERROR;
--  icu::number::FormattedNumber formatted;
-   if (numeric_obj->IsBigInt()) {
-     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
-     Handle<String> big_int_string;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
-                                      BigInt::ToString(isolate, big_int),
--                                     Nothing<icu::UnicodeString>());
--    formatted = number_format.formatDecimal(
-+                                     Nothing<bool>());
-+    *formatted = number_format.formatDecimal(
-         {big_int_string->ToCString().get(), big_int_string->length()}, status);
-   } else {
-     double number = numeric_obj->Number();
--    formatted = number_format.formatDouble(number, status);
-+    *formatted = number_format.formatDouble(number, status);
-   }
-   if (U_FAILURE(status)) {
-     // This happen because of icu data trimming trim out "unit".
-     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  if (fp_iter) {
--    formatted.getAllFieldPositions(*fp_iter, status);
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
-   }
--  icu::UnicodeString result = formatted.toString(status);
--  if (U_FAILURE(status)) {
--    THROW_NEW_ERROR_RETURN_VALUE(isolate,
--                                 NewTypeError(MessageTemplate::kIcuError),
--                                 Nothing<icu::UnicodeString>());
--  }
--  return Just(result);
-+  return Just(true);
- }
- 
- }  // namespace
-@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
-     Handle<Object> numeric_obj) {
-   DCHECK(numeric_obj->IsNumeric());
- 
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<String>());
--  return Intl::ToString(isolate, maybe_format.FromJust());
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString result = formatted.toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
-+  }
-+  return Intl::ToString(isolate, result);
- }
- 
- namespace {
-@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
- }
- 
- namespace {
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
--                          icu::FieldPositionIterator* fp_iter,
-+Maybe<int> ConstructParts(Isolate* isolate,
-+                          icu::number::FormattedNumber* formatted,
-                           Handle<JSArray> result, int start_index,
-                           Handle<Object> numeric_obj, bool style_is_unit) {
-+  UErrorCode status = U_ZERO_ERROR;
-+  icu::UnicodeString formatted_text = formatted->toString(status);
-+  if (U_FAILURE(status)) {
-+    THROW_NEW_ERROR_RETURN_VALUE(
-+        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
-+  }
-   DCHECK(numeric_obj->IsNumeric());
--  int32_t length = formatted.length();
-+  int32_t length = formatted_text.length();
-   int index = start_index;
-   if (length == 0) return Just(index);
- 
-@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-   // other region covers some part of the formatted string. It's possible
-   // there's another field with exactly the same begin and end as this backdrop,
-   // in which case the backdrop's field_id of -1 will give it lower priority.
--  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
-+  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
- 
-   {
--    icu::FieldPosition fp;
--    while (fp_iter->next(fp)) {
--      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
--                                         fp.getEndIndex()));
-+    icu::ConstrainedFieldPosition cfp;
-+    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
-+    while (formatted->nextPosition(cfp, status)) {
-+      regions.push_back(
-+          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
-     }
-   }
- 
-@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
-     Handle<String> substring;
-     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
-         isolate, substring,
--        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
-+        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
-         Nothing<int>());
-     Intl::AddElement(isolate, result, index, field_type_string, substring);
-     ++index;
-@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
-       number_format->icu_number_formatter().raw();
-   CHECK_NOT_NULL(fmt);
- 
--  icu::FieldPositionIterator fp_iter;
--  Maybe<icu::UnicodeString> maybe_format =
--      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
-+  icu::number::FormattedNumber formatted;
-+  Maybe<bool> maybe_format =
-+      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
-   MAYBE_RETURN(maybe_format, Handle<JSArray>());
- 
-   Handle<JSArray> result = factory->NewJSArray(0);
-   Maybe<int> maybe_format_to_parts = ConstructParts(
--      isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
-+      isolate, &formatted, result, 0, numeric_obj,
-       number_format->style() == JSNumberFormat::Style::UNIT);
-   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
- 
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
deleted file mode 100644
index da7a997fe965..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.0-bison-3.7-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1a53f5995697f5ac6fd501dbdc0ee39c9488ee66 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@qt.io>
-Date: Fri, 14 Aug 2020 16:38:48 +0200
-Subject: Fix bison 3.7
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Do a replace run inspired by newer versions of the script.
-
-Fixes: QTBUG-86018
-Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
-Reviewed-by: Michael Brüning <michael.bruning@qt.io>
----
- .../blink/renderer/build/scripts/rule_bison.py        | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/chromium/third_party/blink/renderer/build/scripts/rule_bison.py b/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-index f75e25fd23f..7e0767e951a 100755
---- a/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
-@@ -45,6 +45,19 @@ from utilities import abs
- 
- from blinkbuild.name_style_converter import NameStyleConverter
- 
-+def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
-+    prefix_lines = map(lambda s: s + '\n', prefix_lines)
-+    suffix_lines = map(lambda s: s + '\n', suffix_lines)
-+    with open(path, 'r') as f:
-+        old_lines = f.readlines()
-+    for i in range(len(old_lines)):
-+        for src, dest in replace_list:
-+            old_lines[i] = old_lines[i].replace(src, dest)
-+    new_lines = prefix_lines + old_lines + suffix_lines
-+    with open(path, 'w') as f:
-+        f.writelines(new_lines)
-+
-+
- assert len(sys.argv) == 4 or len(sys.argv) == 5
- 
- inputFile = abs(sys.argv[1])
-@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
- print >>outputHFile, outputHContents
- print >>outputHFile, '#endif  // %s' % headerGuard
- outputHFile.close()
-+
-+common_replace_list = [(inputRoot + '.hh',
-+                        inputRoot + '.h')]
-+modify_file(
-+    outputCpp, [], [],
-+    replace_list=common_replace_list)
--- 
-cgit v1.2.1
-
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.1-icu-68.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.1-icu-68.patch
new file mode 100644
index 000000000000..dbabd29d5b1b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.1-icu-68.patch
@@ -0,0 +1,260 @@
+From 202158edd4643f11deaa79b6d88fed9bcdf47256 Mon Sep 17 00:00:00 2001
+From: Jimi Huotari <chiitoo@gentoo.org>
+Date: Tue, 3 Nov 2020 01:10:53 +0200
+Subject: [PATCH] Fix compilation with system ICU 68
+
+Public header files no longer define/use the macros FALSE and TRUE.
+
+- https://github.com/unicode-org/icu/commit/a18df7ba
+- http://site.icu-project.org/download/68
+- https://bugs.gentoo.org/751997
+
+Thanks to: Lars Wendler <polynomial-c@gentoo.org>
+
+--- a/src/3rdparty/chromium/base/i18n/string_compare.cc
++++ b/src/3rdparty/chromium/base/i18n/string_compare.cc
+@@ -18,8 +18,8 @@
+                                              StringPiece16 rhs) {
+   UErrorCode error = U_ZERO_ERROR;
+   UCollationResult result = collator.compare(
+-      icu::UnicodeString(FALSE, lhs.data(), static_cast<int>(lhs.length())),
+-      icu::UnicodeString(FALSE, rhs.data(), static_cast<int>(rhs.length())),
++      icu::UnicodeString(false, lhs.data(), static_cast<int>(lhs.length())),
++      icu::UnicodeString(false, rhs.data(), static_cast<int>(rhs.length())),
+       error);
+   DCHECK(U_SUCCESS(error));
+   return result;
+--- a/src/3rdparty/chromium/base/i18n/time_formatting.cc
++++ b/src/3rdparty/chromium/base/i18n/time_formatting.cc
+@@ -236,7 +236,7 @@
+   icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE);
+   measure_format.formatMeasures(measures, 3, formatted, ignore, status);
+   *out = i18n::UnicodeStringToString16(formatted);
+-  return U_SUCCESS(status) == TRUE;
++  return U_SUCCESS(status) == true;
+ }
+ 
+ string16 DateIntervalFormat(const Time& begin_time,
+--- a/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc
++++ b/src/3rdparty/chromium/components/autofill/core/common/autofill_regexes.cc
+@@ -43,7 +43,7 @@
+ icu::RegexMatcher* AutofillRegexes::GetMatcher(const base::string16& pattern) {
+   auto it = matchers_.find(pattern);
+   if (it == matchers_.end()) {
+-    const icu::UnicodeString icu_pattern(FALSE, pattern.data(),
++    const icu::UnicodeString icu_pattern(false, pattern.data(),
+                                          pattern.length());
+ 
+     UErrorCode status = U_ZERO_ERROR;
+@@ -70,20 +70,20 @@
+   base::AutoLock lock(*g_lock);
+ 
+   icu::RegexMatcher* matcher = g_autofill_regexes->GetMatcher(pattern);
+-  icu::UnicodeString icu_input(FALSE, input.data(), input.length());
++  icu::UnicodeString icu_input(false, input.data(), input.length());
+   matcher->reset(icu_input);
+ 
+   UErrorCode status = U_ZERO_ERROR;
+   UBool matched = matcher->find(0, status);
+   DCHECK(U_SUCCESS(status));
+ 
+-  if (matched == TRUE && match) {
++  if (matched == true && match) {
+     icu::UnicodeString match_unicode = matcher->group(0, status);
+     DCHECK(U_SUCCESS(status));
+     *match = base::i18n::UnicodeStringToString16(match_unicode);
+   }
+ 
+-  return matched == TRUE;
++  return matched == true;
+ }
+ 
+ }  // namespace autofill
+--- a/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
++++ b/src/3rdparty/chromium/components/spellcheck/renderer/spellcheck_worditerator.cc
+@@ -424,7 +424,7 @@
+   // spellchecker and we need manual normalization as well. The normalized
+   // text does not have to be NUL-terminated since its characters are copied to
+   // string16, which adds a NUL character when we need.
+-  icu::UnicodeString input(FALSE, &text_[input_start],
++  icu::UnicodeString input(false, &text_[input_start],
+                            base::checked_cast<int32_t>(input_length));
+   UErrorCode status = U_ZERO_ERROR;
+   icu::UnicodeString output;
+--- a/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
++++ b/src/3rdparty/chromium/components/url_formatter/spoof_checks/idn_spoof_checker.cc
+@@ -315,7 +315,7 @@
+   if (U_FAILURE(status) || (result & USPOOF_ALL_CHECKS))
+     return false;
+ 
+-  icu::UnicodeString label_string(FALSE /* isTerminated */, label.data(),
++  icu::UnicodeString label_string(false /* isTerminated */, label.data(),
+                                   base::checked_cast<int32_t>(label.size()));
+ 
+   // A punycode label with 'xn--' prefix is not subject to the URL
+@@ -491,7 +491,7 @@
+ Skeletons IDNSpoofChecker::GetSkeletons(base::StringPiece16 hostname) {
+   Skeletons skeletons;
+   size_t hostname_length = hostname.length() - (hostname.back() == '.' ? 1 : 0);
+-  icu::UnicodeString host(FALSE, hostname.data(), hostname_length);
++  icu::UnicodeString host(false, hostname.data(), hostname_length);
+   // If input has any characters outside Latin-Greek-Cyrillic and [0-9._-],
+   // there is no point in getting rid of diacritics because combining marks
+   // attached to non-LGC characters are already blocked.
+@@ -690,7 +690,7 @@
+     base::StringPiece tld,
+     base::StringPiece16 tld_unicode) const {
+   icu::UnicodeString tld_string(
+-      FALSE /* isTerminated */, tld_unicode.data(),
++      false /* isTerminated */, tld_unicode.data(),
+       base::checked_cast<int32_t>(tld_unicode.size()));
+   if (cyrillic_letters_.containsSome(tld_string)) {
+     return true;
+--- a/src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc
++++ b/src/3rdparty/chromium/services/service_manager/zygote/zygote_linux.cc
+@@ -564,7 +564,7 @@
+   if (!iter.ReadString16(&timezone_id))
+     return -1;
+   icu::TimeZone::adoptDefault(icu::TimeZone::createTimeZone(
+-      icu::UnicodeString(FALSE, timezone_id.data(), timezone_id.length())));
++      icu::UnicodeString(false, timezone_id.data(), timezone_id.length())));
+ 
+   if (!iter.ReadInt(&numfds))
+     return -1;
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/locale_icu.cc
+@@ -168,12 +168,12 @@
+     return g_empty_string;
+ 
+   UErrorCode status = U_ZERO_ERROR;
+-  int32_t length = udat_toPattern(date_format, TRUE, nullptr, 0, &status);
++  int32_t length = udat_toPattern(date_format, true, nullptr, 0, &status);
+   if (status != U_BUFFER_OVERFLOW_ERROR || !length)
+     return g_empty_string;
+   StringBuffer<UChar> buffer(length);
+   status = U_ZERO_ERROR;
+-  udat_toPattern(date_format, TRUE, buffer.Characters(), length, &status);
++  udat_toPattern(date_format, true, buffer.Characters(), length, &status);
+   if (U_FAILURE(status))
+     return g_empty_string;
+   return String::Adopt(buffer);
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator_icu.cc
+@@ -311,13 +311,13 @@
+       text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
+                               ? static_cast<int32_t>(offset)
+                               : 0;
+-      is_accessible = TRUE;
++      is_accessible = true;
+       return true;
+     }
+     if (native_index >= native_length &&
+         text->chunkNativeLimit == native_length) {
+       text->chunkOffset = text->chunkLength;
+-      is_accessible = FALSE;
++      is_accessible = false;
+       return true;
+     }
+   } else {
+@@ -330,12 +330,12 @@
+       text->chunkOffset = offset <= std::numeric_limits<int32_t>::max()
+                               ? static_cast<int32_t>(offset)
+                               : 0;
+-      is_accessible = TRUE;
++      is_accessible = true;
+       return true;
+     }
+     if (native_index <= 0 && !text->chunkNativeStart) {
+       text->chunkOffset = 0;
+-      is_accessible = FALSE;
++      is_accessible = false;
+       return true;
+     }
+   }
+@@ -346,7 +346,7 @@
+                               int64_t native_index,
+                               UBool forward) {
+   if (!text->context)
+-    return FALSE;
++    return false;
+   int64_t native_length = TextNativeLength(text);
+   UBool is_accessible;
+   if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
+@@ -370,7 +370,7 @@
+     DCHECK_EQ(new_context, kPriorContext);
+     TextLatin1SwitchToPriorContext(text, native_index, native_length, forward);
+   }
+-  return TRUE;
++  return true;
+ }
+ 
+ static const struct UTextFuncs kTextLatin1Funcs = {
+@@ -510,7 +510,7 @@
+ 
+ static UBool TextUTF16Access(UText* text, int64_t native_index, UBool forward) {
+   if (!text->context)
+-    return FALSE;
++    return false;
+   int64_t native_length = TextNativeLength(text);
+   UBool is_accessible;
+   if (TextInChunkOrOutOfRange(text, native_index, native_length, forward,
+@@ -532,7 +532,7 @@
+     DCHECK_EQ(new_context, kPriorContext);
+     TextUTF16SwitchToPriorContext(text, native_index, native_length, forward);
+   }
+-  return TRUE;
++  return true;
+ }
+ 
+ static const struct UTextFuncs kTextUTF16Funcs = {
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/unicode_utilities.cc
+@@ -300,7 +300,7 @@
+   DCHECK(U_SUCCESS(status));
+   int32_t input_length = static_cast<int32_t>(length);
+   // copy-on-write.
+-  icu::UnicodeString normalized(FALSE, characters, input_length);
++  icu::UnicodeString normalized(false, characters, input_length);
+   // In the vast majority of cases, input is already NFC. Run a quick check
+   // to avoid normalizing the entire input unnecessarily.
+   int32_t normalized_prefix_length =
+--- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
+@@ -326,7 +326,7 @@
+   DLOG_IF(ERROR, err == U_AMBIGUOUS_ALIAS_WARNING)
+       << "ICU ambiguous alias warning for encoding: " << encoding_.GetName();
+   if (converter_icu_)
+-    ucnv_setFallback(converter_icu_, TRUE);
++    ucnv_setFallback(converter_icu_, true);
+ }
+ 
+ int TextCodecICU::DecodeToBuffer(UChar* target,
+--- a/src/3rdparty/chromium/ui/base/l10n/formatter.cc
++++ b/src/3rdparty/chromium/ui/base/l10n/formatter.cc
+@@ -232,7 +232,7 @@
+                        int value,
+                        icu::UnicodeString* formatted_string) const {
+   DCHECK(simple_format_[unit]);
+-  DCHECK(formatted_string->isEmpty() == TRUE);
++  DCHECK(formatted_string->isEmpty() == true);
+   UErrorCode error = U_ZERO_ERROR;
+   FormatNumberInPlural(*simple_format_[unit],
+                         value, formatted_string, &error);
+@@ -248,7 +248,7 @@
+       << "Detailed() not implemented for your (format, length) combination!";
+   DCHECK(detailed_format_[units][1])
+       << "Detailed() not implemented for your (format, length) combination!";
+-  DCHECK(formatted_string->isEmpty() == TRUE);
++  DCHECK(formatted_string->isEmpty() == true);
+   UErrorCode error = U_ZERO_ERROR;
+   FormatNumberInPlural(*detailed_format_[units][0], value_1,
+                        formatted_string, &error);
+@@ -281,7 +281,7 @@
+     base::string16 pattern = l10n_util::GetStringUTF16(pluralities.id);
+     UErrorCode error = U_ZERO_ERROR;
+     std::unique_ptr<icu::MessageFormat> format(new icu::MessageFormat(
+-        icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error));
++        icu::UnicodeString(false, pattern.data(), pattern.length()), error));
+     DCHECK(U_SUCCESS(error));
+     if (format.get())
+       return format;
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
deleted file mode 100644
index 99d5a260ec36..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 x86"
-fi
-
-IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-	app-arch/snappy:=
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtprintsupport-${PV}
-	~dev-qt/qtwebchannel-${PV}[qml]
-	dev-libs/expat
-	dev-libs/libevent:=
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	dev-libs/re2:=
-	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/mesa[egl,X(+)]
-	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/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst
-	alsa? ( media-libs/alsa-lib )
-	designer? ( ~dev-qt/designer-${PV} )
-	geolocation? ( ~dev-qt/qtpositioning-${PV} )
-	kerberos? ( virtual/krb5 )
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( media-video/ffmpeg:0= )
-	system-icu? ( >=dev-libs/icu-60.2:= )
-	widgets? (
-		~dev-qt/qtdeclarative-${PV}[widgets]
-		~dev-qt/qtwidgets-${PV}
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=app-arch/gzip-1.7
-	dev-util/gperf
-	dev-util/ninja
-	dev-util/re2c
-	sys-devel/bison
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
-	"${FILESDIR}/${P}-icu67.patch" # bug 720054
-	"${FILESDIR}/${P}-gcc-10.patch" # bug 721876
-	"${FILESDIR}/${PN}-5.15.0-bison-3.7-build.patch" # bug 740580
-)
-
-src_prepare() {
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/buildtools/config/common.pri || die
-	fi
-
-	# bug 630834 - pass appropriate options to ninja when building GN
-	sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
-		-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | \
-		xargs sed -i -e 's|INCLUDEPATH += |&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
-	if use system-icu; then
-		# Sanity check to ensure that bundled copy of ICU is not used.
-		# Whole src/3rdparty/chromium/third_party/icu directory cannot be deleted because
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn is used by build system.
-		# If usage of headers of bundled copy of ICU occurs, then lists of shim headers in
-		# shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
-		# src/3rdparty/chromium/third_party/icu/BUILD.gn should be updated.
-		local file
-		while read file; do
-			echo "#error This file should not be used!" > "${file}" || die
-		done < <(find src/3rdparty/chromium/third_party/icu -type f "(" -name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
-	fi
-
-	qt_use_disable_config alsa webengine-alsa src/buildtools/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/buildtools/config/linux.pri
-
-	qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets src/src.pro
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	export NINJA_PATH=/usr/bin/ninja
-	export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
-	local myqmakeargs=(
-		--
-		-printing-and-pdf
-		-system-opus
-		-system-webp
-		$(usex alsa '-alsa' '-no-alsa')
-		$(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
-		$(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
-		$(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
-		$(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
-		$(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
-		$(usex system-icu '-webengine-icu' '-no-webengine-icu')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
index 2fa0f1bc3406..bb6ba8d69f0a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 fi
 
 IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
@@ -40,7 +40,7 @@ RDEPEND="
 	media-libs/lcms:2
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:0=
-	>=media-libs/libvpx-1.5:=[svc]
+	>=media-libs/libvpx-1.5:=[svc(+)]
 	media-libs/libwebp:=
 	media-libs/mesa[egl,X(+)]
 	media-libs/opus
@@ -81,7 +81,10 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
+PATCHES=(
+	"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+	"${FILESDIR}/${P}-icu-68.patch" # bug 751997
+)
 
 src_prepare() {
 	if use ppc64; then
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index d7e6769db468..f1b0248ed0d6 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,4 +1,5 @@
 AUX qtwebkit-5.212.0_pre20200309-bison-3.7.patch 1613 BLAKE2B 0d2d173b5575ed5e1c52a07c5ceb14210bfb0a91e50a064df1e293451d64708822eb54d65947413efb13711d4c0c8e01441869248a4461446bd2bc122f07746b SHA512 cf21eff51e1026f4e506724a512b9925d4619909f5924bf01055244817ec9594e9d3ce105b510cd28ecce4772d122d1393fb7273501e20e16749f43282a3200b
+AUX qtwebkit-5.212.0_pre20200309-icu-68.patch 4981 BLAKE2B c031aa8ec816749fa35e3876d007a02d60a3a5ff0fc57a2774a13fc23559b39cc5bfeec6fedd96cb36d7eed5d1b388049d190673afbe5b0fd2f0343f8afd5344 SHA512 b1cf2a5c07e4876e74913687417ffd751e6dcb3fa783c545ba50064d31c9a4bb1515ce9c26b399f2b9b53b588791e4e6f571ad7cfe631087ecd3709bce675a9e
 DIST qtwebkit-5.212.0-alpha4.tar.xz 12528508 BLAKE2B 72d7444f270f47b62044cf683ed306803660bfbafe1450440ea29e43e3c0e6e841b6e860dfa8affc1b32b7c539448f04e22a7ae38cce055d37905dfb3240aab0 SHA512 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
-EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3934 BLAKE2B b94f1d729667fa6e2abd67951b09dcfb856c38f6e28cfafdeeacac4bc1970db4521ada4c42557ceb1b69815e9491ef8177fae9f4919381acff498a3b22b7428d SHA512 231f042c6f2b258bc908e117f395e02477dfc1f45587e055c26538a31df74a198e61f37cbec0d5eb356b724d75c0a1b9352b3b91a4c0f53314fd9984f771b296
+EBUILD qtwebkit-5.212.0_pre20200309-r1.ebuild 3981 BLAKE2B 80fde8478337ea3d2bc557761836b14c3876fffc5134858e739a53cf48a5f1a335710c59410048ab9e9ceddc92a322f829eb6486e32730dbf0d9fb6f207dec70 SHA512 7ffab643e6e078cbf6f968f7aaad8849c888da8f7117098275b66b09e2b0bf5eb3516af25fe548a6a841a6a48bcfd595ae569d0f5beaba1b5ee50bca8112e1f6
 MISC metadata.xml 1152 BLAKE2B 6291c4643d29dd68af56e6054c4db1ebb307fdf2097012182dc77a2754e51bca84c1f53ae7c9f6305ead35cc47334a9e0ca605871aac899ce06482d983c8406f SHA512 28146a11931ab5b106d7bfa08dd3cb38ed3ae1fec003ca27f3f3234887bc9d65a82c76e5ab50334e94de02c3b6455a228acec2574c551e218e53e2005becc6c6
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
new file mode 100644
index 000000000000..7de72ea61aff
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.212.0_pre20200309-icu-68.patch
@@ -0,0 +1,120 @@
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+             text->chunkOffset = text->chunkLength;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     } else {
+@@ -94,12 +94,12 @@
+             // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+             ASSERT(offset < std::numeric_limits<int32_t>::max());
+             text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+-            isAccessible = TRUE;
++            isAccessible = true;
+             return true;
+         }
+         if (nativeIndex <= 0 && !text->chunkNativeStart) {
+             text->chunkOffset = 0;
+-            isAccessible = FALSE;
++            isAccessible = false;
+             return true;
+         }
+     }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@
+         if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (index >= length && uText->chunkNativeLimit == length) {
+             // Off the end of the buffer, but we can't get it.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return FALSE;
++            return false;
+         }
+     } else {
+         if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+             // Already inside the buffer. Set the new offset.
+             uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+-            return TRUE;
++            return true;
+         }
+         if (!index && !uText->chunkNativeStart) {
+             // Already at the beginning; can't go any farther.
+             uText->chunkOffset = 0;
+-            return FALSE;
++            return false;
+         }
+     }
+     
+@@ -144,7 +144,7 @@
+ 
+     uText->nativeIndexingLimit = uText->chunkLength;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+     if (!text->context)
+-        return FALSE;
++        return false;
+     int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+     UBool isAccessible;
+     if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@
+         ASSERT(newContext == UTextProviderContext::PriorContext);
+         textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+     }
+-    return TRUE;
++    return true;
+ }
+ 
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@
+     m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+     ASSERT(U_SUCCESS(err));
+     if (m_converterICU)
+-        ucnv_setFallback(m_converterICU, TRUE);
++        ucnv_setFallback(m_converterICU, true);
+ }
+ 
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
index f7f37face2cb..0643a363a478 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20200309-r1.ebuild
@@ -83,7 +83,10 @@ RDEPEND="${DEPEND}"
 
 CHECKREQS_DISK_BUILD="16G" # bug 417307
 
-PATCHES=( "${FILESDIR}/${P}-bison-3.7.patch" ) # bug 736499
+PATCHES=(
+	"${FILESDIR}/${P}-bison-3.7.patch" # bug 736499
+	"${FILESDIR}/${P}-icu-68.patch" # bug 753260
+)
 
 _check_reqs() {
 	if [[ ${MERGE_TYPE} != binary ]] && is-flagq "-g*" && ! is-flagq "-g*0"; then
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 6f2a0b9ae9f1..3866ad8b4743 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebsockets-everywhere-src-5.14.2.tar.xz 252820 BLAKE2B a2c14205fbc7f2bb3d7de1d4dff18557e027cb0d114285aa2cd7558fac63da628d7a8b1772b738194983e77bf108e097c29fe2ec02ace85a188674248bb61ade SHA512 091e17459a8a255fccece092399ac32994307aa53e6e72e736e6ff9f1bb745c49bfcb9a747e1e21acaa0ed95754f7f450ba2f73a3bbafad54e21bf600f7da92f
 DIST qtwebsockets-everywhere-src-5.15.1.tar.xz 258908 BLAKE2B cd5c5fbdbbc0191379cbcc6821250597982696e589e1caa18d91258fd6c3eacdb27fd11da94b0e68864c8f3e60c712a052516f5838e56249767125a90e077443 SHA512 5929f972b7e8aa40dbbd0a1157065bd11e81621cc880d1dfc55e4228800215d16cd301319a204413e7fee7ec57c4e5a70229ad2d3c1d3ac69f38bd39ce4b3713
-EBUILD qtwebsockets-5.14.2.ebuild 538 BLAKE2B cc18d2bf9d5cddc7d87c7113360a21dbdbf8008173c003b04a2d6de6e57ab20dd65e16718408c24f2dc6fa530097758898747482e5bd66b008e5cb9c673ecc9e SHA512 160f32a682c72bae09dd4a875d75c48ad7f1f093a76fa994613c332eeea1050286ed19e942d29fb82c8c579012da34d1313df5624248d237fc1d65f11261d756
-EBUILD qtwebsockets-5.15.1.ebuild 543 BLAKE2B 81ee48cda5fa05343a359d6458e2209496f2e180533db2c4947118d66bdff6dd281ccbf2383ea2176c1b3829bd0c07f1ae0b95e50c4813123c3e23c47614428a SHA512 ed527ddf617aa7def7f2eb8793b56a83627c0a034993b767c0358835ca4b7dda3aeef5ffa483131f69279448893615873ad9768d2bfd8fb5c973ee9bfc22b473
+EBUILD qtwebsockets-5.15.1.ebuild 538 BLAKE2B cc18d2bf9d5cddc7d87c7113360a21dbdbf8008173c003b04a2d6de6e57ab20dd65e16718408c24f2dc6fa530097758898747482e5bd66b008e5cb9c673ecc9e SHA512 160f32a682c72bae09dd4a875d75c48ad7f1f093a76fa994613c332eeea1050286ed19e942d29fb82c8c579012da34d1313df5624248d237fc1d65f11261d756
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
deleted file mode 100644
index 765ce319f886..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
-fi
-
-IUSE="qml +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}[ssl=]
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
index bb21ea253730..765ce319f886 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~sparc x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 9c0fc665f5c4..b7c52e58623a 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,5 +1,3 @@
-DIST qtwebview-everywhere-src-5.14.2.tar.xz 132840 BLAKE2B 8d6d2995b53f55b04353c935f5655c47d34a0e61d68adce5837ac0b6074aae59f506dd49acc700b7c26ca04aa16d03749520329540513a646809ba6e353bc69a SHA512 1a70be0c64f72b7e3b10c8e3ca58d4a04bef14496c8e4852c5cafbd13d653e2f682a58f7dcd576fce79ed082c01a5f8ffc6533836f495f6e5d4b6ddf2be8e3ca
 DIST qtwebview-everywhere-src-5.15.1.tar.xz 133392 BLAKE2B 6958323ffe5d2d10b07bb7b926a05aa3f74d5aa38465f94e51877c162b4b2bd8e4733eda122bc691262f20dca9875177b1fbb260a922923e3e20611a2294dc71 SHA512 1da9cca184e66b02eef911e372d0f18466b989cc5c53d0a93e268857e1ca64a2f75bf20dfd1451060e6dbf4c7d248ba376112b7775e45ffa7d556712870478b1
-EBUILD qtwebview-5.14.2.ebuild 431 BLAKE2B 8575a235f2d6b8fa8b4b116a1f5df40fbb6da4773818320f05ac001290c84bcde8e2b34f15004fccbd661d8e9cadc4437c7dba1019346bc8fac82d710c6319dd SHA512 bfb61afbe4d1bc4d1dc3862ed29a6feb6ca18dc68b146cd8d0c408d2dbed9977b1591d434eaed17afa6d5dfffb2d771c9c5c61d824a565628e3fdce4f4d211d9
 EBUILD qtwebview-5.15.1.ebuild 431 BLAKE2B 8575a235f2d6b8fa8b4b116a1f5df40fbb6da4773818320f05ac001290c84bcde8e2b34f15004fccbd661d8e9cadc4437c7dba1019346bc8fac82d710c6319dd SHA512 bfb61afbe4d1bc4d1dc3862ed29a6feb6ca18dc68b146cd8d0c408d2dbed9977b1591d434eaed17afa6d5dfffb2d771c9c5c61d824a565628e3fdce4f4d211d9
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwebview/qtwebview-5.14.2.ebuild b/dev-qt/qtwebview/qtwebview-5.14.2.ebuild
deleted file mode 100644
index 10d7f8d00008..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.14.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwebengine-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 72929ce35864..de9bbb0352e5 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtwidgets-5.14.2.ebuild 1041 BLAKE2B 728671cef741bd25389eb98e85def46f3e9bb878f5df8ff1a4cb08be7edb5b11265978ac3f3af1663879d103224c01e9a8e93b6c85d7af5b76d3bae87eb2a4dc SHA512 12b194ec32e7eb39399e001a8f590ded9b2729a6a8286868a8977798c0821e9b51dc42cb25d1b0f5dc05b32be5ce961006e5c115193e4cabfe5c8add49751624
-EBUILD qtwidgets-5.15.1.ebuild 1023 BLAKE2B d7ef3bfccf7811dcd98e6e5396a1c74ffc2a0ddf946d2d53bdaf4b4cdf2b4302fe2ea8e3ea0c1341a1464903c2c05b101f344955a60c76d5891c0538e232101c SHA512 61e6f7f44674778a41f6e24d9758877cd62cc532cebe58c9d1d5ca1bcbd613608c8282c0005ac6519faf82b93a4f48ce4d100bf5b25cd4f47f26c2d0b7038517
+EBUILD qtwidgets-5.15.1.ebuild 1017 BLAKE2B ecc9e4c3d8776264b7df59643fd1798ac5264e974c7e11eb360d6dace71ba46ec63a57507833f1977e7c0eab7562ccdffeec924ba032715a41d13142ba208610 SHA512 2f0d7a04fda02edd0d8e230e7951c14faf5cc920af48b08d78f0a663e45cb60a87a9c2a1d595f22c7fa4fbd9656d5f2369c2e5d0f3882665f444201b8646f740
 MISC metadata.xml 558 BLAKE2B c7089423680ebf689b6367ece6366ed03a25424b5b85ccecbfbbf0086d3d9bcd36a4fca1c5f4e3fce1c1502c2444d94f30b7b3d0addc1019452aa206d661bf51 SHA512 013a8a653ae20d070ce0cf42797ae05b89510e600b40fd061541c634d4faa24040c3d486ac8c4fe39ba918af57c2aa5d3954f35d3fd4f850dc732521f5a699c5
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
deleted file mode 100644
index 3704914a9488..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +X"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}:5=
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,X?]
-	gtk? (
-		~dev-qt/qtgui-${PV}[dbus]
-		x11-libs/gtk+:3
-		x11-libs/libX11
-		x11-libs/pango
-	)
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/uic
-	src/widgets
-	src/plugins/platformthemes
-)
-
-QT5_GENTOO_CONFIG=(
-	gtk:gtk3:
-	::widgets
-	!:no-widgets:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:widgets
-)
-
-src_configure() {
-	local myconf=(
-		-opengl $(usex gles2-only es2 desktop)
-		$(qt_use gtk)
-		-gui
-		$(qt_use png libpng system)
-		-widgets
-		$(qt_use X xcb system)
-		$(usex X '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
index 30655fc94224..df8813553b9b 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 92b03b226381..945d47aa4e71 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,5 +1,3 @@
-DIST qtx11extras-everywhere-src-5.14.2.tar.xz 135712 BLAKE2B 83890aab605bdfaacdddbc7a1893bd570a15f4135bfd924ca923570b3d12042b916f493426b1945319afd60e651f51ad49b3575b69b07ed4264a8a6cd7005a49 SHA512 cf30e66fda18b9bfd266b41f15713f7ca7390bc533fb8093096853f1554c2a91eb065dc17acb5b355b8fad08df3c695289d8c8081d568061c99659ec35d79b14
 DIST qtx11extras-everywhere-src-5.15.1.tar.xz 143884 BLAKE2B a740621a4fe41b075dd5843f28bfa1d128e24d1df786b5c8aa0ceba5fe7fc59bc212b7ec8855c4a1eef7cd812615837e38089c9e9fd189dda16f5313d6091af6 SHA512 59155fc97da3f7571da37dd63bed79f61580fa4df7d4886df51520ea6fe8e01e7c09f0aa9caaeaa986c0e5eac11d4479c99c892da4d075c6369b535fd505b084
-EBUILD qtx11extras-5.14.2.ebuild 430 BLAKE2B af2349c3243d9e48a3519f2622e5328c6ff6d3dc4583d515dd5ddf4e2cbdc96d303ed0c03baf6958b5313773ec1aa0996d4c3acc4bf87c9838ffeaa8e80e90fd SHA512 41790320a22eb3209894adc90debcf32ccae299a61d9715e8a9d735dca75e20bc7bd64bb73a485c821b97efa8a02dae8f140f1526b8159dc643de481b6b12f4e
-EBUILD qtx11extras-5.15.1.ebuild 436 BLAKE2B 4be61843a21d0e6986416682d3613c76c8953ee3946fc435c1af771af2bb9a62c9191dabff85bd88edafc81d5029b18f1f8a5b38bc7cefe85f0b42191f5180bc SHA512 6bd6c59c8b68d98a3ee9d4c5fe2816def7c01bc72348a6cf5e7c99d70a46ef0b6b84acc5f478d04dd8863cc5b4222651b204b42aadaa1169d2ba81f5cf7300df
+EBUILD qtx11extras-5.15.1.ebuild 430 BLAKE2B af2349c3243d9e48a3519f2622e5328c6ff6d3dc4583d515dd5ddf4e2cbdc96d303ed0c03baf6958b5313773ec1aa0996d4c3acc4bf87c9838ffeaa8e80e90fd SHA512 41790320a22eb3209894adc90debcf32ccae299a61d9715e8a9d735dca75e20bc7bd64bb73a485c821b97efa8a02dae8f140f1526b8159dc643de481b6b12f4e
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild
deleted file mode 100644
index 90bcd0786891..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qt5-build
-
-DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[X]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
index 32aefe9b955d..90bcd0786891 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index 4248f639e9d2..515181e9a89d 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,5 +1,3 @@
-DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
 DIST qtbase-everywhere-src-5.15.1.tar.xz 50153132 BLAKE2B 5a8cbbf8d44c7affc8ee43db04bd024bb529e0707b1feee2c7ae439cdf1331b1cf3e89b84c6a6f5bab3ec34025fbd634a8f4d259bd64ece172f288500e5b59e6 SHA512 40b687c046b25a6717834ffe2616ee4f373d75214ec1c7e3a26502cd0cde9f0a872eaee99f06c54c7a3625ae85df5cdd3a3b54a160e8e37c7cfeb5800d026fe4
-EBUILD qtxml-5.14.2.ebuild 493 BLAKE2B d5e9b5e3343e79f9634babf8b35700cce83e159e882b69e49c4adb232a9de54eb05d54b8314243c5e7f8ce083b0d467f5fa664d863fdd180223f1b7867273584 SHA512 6fd673bb0cfd964e898bb8358c2a1237027958dbe0eb0cd59dddb181caf290be7da7c397c152709d217daee21a76f6590fbb261fcff52485db1435534fd12bc2
-EBUILD qtxml-5.15.1.ebuild 499 BLAKE2B ce015661de5f79c2bc6e2cb3b53847e842a13c2b4be275bbbb360572870df66c38caf398122e3196ecff8fb23fe7e3cad9af80debba17e0cbe2e44010d7dd691 SHA512 7b4ad9d7f67ed3601ca133239518966781f674cf443e3ca8bb568c74178c60cc5a630c7a07af452d12e917b864ebe4bd86a82dc64283d72b3557d723f6703038
+EBUILD qtxml-5.15.1.ebuild 493 BLAKE2B d5e9b5e3343e79f9634babf8b35700cce83e159e882b69e49c4adb232a9de54eb05d54b8314243c5e7f8ce083b0d467f5fa664d863fdd180223f1b7867273584 SHA512 6fd673bb0cfd964e898bb8358c2a1237027958dbe0eb0cd59dddb181caf290be7da7c397c152709d217daee21a76f6590fbb261fcff52485db1435534fd12bc2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.14.2.ebuild b/dev-qt/qtxml/qtxml-5.14.2.ebuild
deleted file mode 100644
index 1f6a108a9d98..000000000000
--- a/dev-qt/qtxml/qtxml-5.14.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}:5=
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/xml
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:xml
-)
diff --git a/dev-qt/qtxml/qtxml-5.15.1.ebuild b/dev-qt/qtxml/qtxml-5.15.1.ebuild
index c475c1b3f0d3..1f6a108a9d98 100644
--- a/dev-qt/qtxml/qtxml-5.15.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.15.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 2a36d3d09995..0dca07922b94 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,5 +1,3 @@
-DIST qtxmlpatterns-everywhere-src-5.14.2.tar.xz 1404028 BLAKE2B aff0d2aa2396418c2b987f1485d3753546c09de8d5eb06efab52d635e95f8e056def8a4b6927d8d8f24c3af264cf762e64a2b3fa9d318671df4ea0f0f3f5bf0a SHA512 27f674c4811b010ec461c54ee258b1d6b58dcb5c11795621b7bbad9fa2c19c1b6b62286cbe8895151261129c7d6d91007c3a8be6cf64af1f4cb32e2e9976ac23
 DIST qtxmlpatterns-everywhere-src-5.15.1.tar.xz 1415888 BLAKE2B f17a1dee54ee981fb435c2536f28b015d0a4ce48cf504c5f11b03992a9e569190e2ae8fd9960a408ddec54bdc14588cd498cbf9da0002f696c336af72b211e5a SHA512 f76b2063f88a14754b1ba7e417b9a4936b1cf371bf35c6382a31f9ec01513894313faacb41a43fe6b97c0b0dbb7d4f578877b159ef1321cd1a2cd9b1d36bcdb3
-EBUILD qtxmlpatterns-5.14.2.ebuild 620 BLAKE2B 26f069b65dc5803f59258230047818e365421cf866f5cc1052d506840b158d6a276c35f8a91b11677899cd2f7293ede13c2c5523c981b7bd53003ad13829ac0d SHA512 3ddd0ea1ceaa0c5d93b95f4a328c147a13568f957d6f2348140cc241ff81f455cbeecc3548aeea75972e106b4250ec7fde571ac25aa0336576b06f9c913d1613
-EBUILD qtxmlpatterns-5.15.1.ebuild 626 BLAKE2B 72d955fa0935cf43842e8db6f2ed6b801f9c28bfb81b49f8ac0301c91cb667bcfbfc22cbdc356a98458fb368310187f841d0a713002e41206c7c62fca5cdf092 SHA512 6d1fabf23e5da30d77556500067eb35ee7be575970b97af1b49cdb8be431a5398a48b794bcb35f9d4902f1c59da8ff4c066445515470605819e4927932a0113a
+EBUILD qtxmlpatterns-5.15.1.ebuild 620 BLAKE2B 26f069b65dc5803f59258230047818e365421cf866f5cc1052d506840b158d6a276c35f8a91b11677899cd2f7293ede13c2c5523c981b7bd53003ad13829ac0d SHA512 3ddd0ea1ceaa0c5d93b95f4a328c147a13568f957d6f2348140cc241ff81f455cbeecc3548aeea75972e106b4250ec7fde571ac25aa0336576b06f9c913d1613
 MISC metadata.xml 589 BLAKE2B bbca816148efdf3a04c05ea1c653a4e9a6e7c9c8109283719d53a06188e495df1addfceca8acc374ed03b89391fe14c70eb6e84b4f5343fb7345e841d50d8ee0 SHA512 dfd095f116f9223cea460984b650cf9d6f506f1bc5e43ae38429528d1218863d785fb47e05a3c9eb4891838d58baa967de3ac31d59e38c4de90a5655c8344d4b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
deleted file mode 100644
index 2401961cd1d4..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml qml \
-		src/src.pro \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick tests/auto/auto.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild
index 66fa234d35c7..2401961cd1d4 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.1.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="XPath, XQuery, XSLT, and XML Schema validation library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86"
 fi
 
 IUSE="qml"
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /dev-qt
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)