gentoo resync : 14.05.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-05-14 11:09:11 +0100
commit: deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree: 9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-qt
parent: 38423c67c8a23f6a1bc42038193182e2da3116eb (diff)
152 files changed, 486 insertions, 2904 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 88d0be07904e..859588fc004c 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 2483aa935fe5..6670a9b6e419 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD assistant-5.13.2.ebuild 1161 BLAKE2B 370c9a1a998f7fc52f79edf27f884670a587b501adbece08533341dbd44c58f14c86ecdf96137c228460d767d21438bb29d1374f25cc3a71a49b7f57e9f12361 SHA512 67f85b4f1ebc8baf37feca2f1462ae59268ff7eafd3c678d23916116d5035a92f912d195271672d59962ba5ece6872641f9de441ad7935bed35ea0877839b699
 EBUILD assistant-5.14.1.ebuild 1196 BLAKE2B 6b6f0250b9dcf689ae3ec478f792d62cd12adea9a2a684156e7e748d37b1c5c49d11356ed6c5b2c68a2666255b57a9b92c05f64d71c170fe86cc79ae731f0e6b SHA512 45f743516b6d2ee0698a9e072fbcf9889f550eeadef35f4947944f53e79aa44a418cdd40c34254398273b1272bafdf1d82c975ba187aafdb58313e6b1dac09a8
-EBUILD assistant-5.14.2.ebuild 1203 BLAKE2B 8c84ebd6164443a25ff706c24e36e609262a7778b01c1dc5be93b9f6c8dbb8e8193993db80121ab532bf551c129862c616fe986864511700f1d03ca632bce9ef SHA512 00d14550fe6431976d698245ba46e9beedaf72bf54dc876c13a90a750d508f52a375e312c024fa2a062b1aa0eebd9a55cd10fa776dc33ce667acff3bdec3fada
+EBUILD assistant-5.14.2.ebuild 1202 BLAKE2B ce776469b3fc7079a6c53cb80aa5bab5573579d17f244376725f665898612b6342259b1f51b484736d69c3181b0356be8cc06d4522c2314835ce2baa38c1bc10 SHA512 2f4654a8d4eb2dc20089743f3c21770f22dd1043f2ecbb56faac6b3d11e8c971cb560afb847f56f5075b61e18e478be2ea19bddf04c8802f489ca0b24948680b
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/assistant/assistant-5.13.2.ebuild b/dev-qt/assistant/assistant-5.13.2.ebuild
deleted file mode 100644
index 5faa15820d4f..000000000000
--- a/dev-qt/assistant/assistant-5.13.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="~arm"
-fi
-
-IUSE="webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~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.14.2.ebuild b/dev-qt/assistant/assistant-5.14.2.ebuild
index 7f0b3ec1e822..0fceb8f72554 100644
--- a/dev-qt/assistant/assistant-5.14.2.ebuild
+++ b/dev-qt/assistant/assistant-5.14.2.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 33cfa2f637dc..61f18d956919 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD designer-5.13.2.ebuild 1209 BLAKE2B 766c8df7e01de72a109bf7eaf309c4ecdf17a97bed8266b40e6dca8b618e4084ea3dbbf69f1ccda8a5504a6a001370ec79e0ae9292b690bbe4b8e89c1750fd04 SHA512 cc9a875c22e3fcc11be672f17b6db69541d3978b5d6409ff3eefca124c4a0bf0bdffe49663c0919aaf2fbfe54ae442c8ad95a1916fabeea26618dc23cc2c4cdf
 EBUILD designer-5.14.1.ebuild 1242 BLAKE2B 10f39772b0e6ed55e487a4717562872b306e4a7cfdfa88de7366859a86a4ebb47c691adaa731e5d34db67c472c69c6ce730d12da95df7f5464f1b46027f23e0c SHA512 3bd954665346314762f030035c43e2953250be2a84a7b1151d0c611893af413d8f8caa21ba9a32c90d315c4d5609c2b3222b197d2ffd722721f75c0f89777710
-EBUILD designer-5.14.2.ebuild 1253 BLAKE2B 0bbb89f14cb3673bc17a7f2858f46ae88370c4a79d36bf81422b5ddb3f52e93d0e5e78cc312a02c31a7c0e2e6c3cb1aa3de31eb803c8010b218ac4befda019f1 SHA512 a5029db5991981cde423727db9654a5f45f2e6ff0f49579f5acdb714e624b75cbd62d24393b1504f624b20e07515c10229a61a62be448a79fae01abf700e8f48
+EBUILD designer-5.14.2.ebuild 1251 BLAKE2B 8c18309ae74b118b105faa3853b11cda4d5d60a9a62b8d2f3fbd1ae1fe73258b5c9bf5e46407ea6fbf14c880280ac248e066f48330c86bfc4b68465b79744578 SHA512 f3fe044b3779d255e2863c3caded3e682bfd9e82e692149b89e9cdbdff8b26f0d9086e7e321afe92be2561eb7fe09b693e3221e5b75ed10d47b1b8c4167d6131
 MISC metadata.xml 619 BLAKE2B 766504e7a28835cc48bb3908bbc9400b5fd0d268058225e02592f59c638e017c16c763c532fa2699c15c87d51659ff81eb819f24749b861763e4dbadffc329ef SHA512 9e4bf8789b63d5d6d208a7e86e1bd834de14aa3ca8d22e1837a34d55a531340c7414ce0553dbf32c49bc57c1b853c36fa38e0a6c807eb0babd446ca06f3f36f9
diff --git a/dev-qt/designer/designer-5.13.2.ebuild b/dev-qt/designer/designer-5.13.2.ebuild
deleted file mode 100644
index f70d3ad7a151..000000000000
--- a/dev-qt/designer/designer-5.13.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="arm"
-fi
-
-IUSE="declarative webkit"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~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.14.2.ebuild b/dev-qt/designer/designer-5.14.2.ebuild
index 8e394f7f3b59..396d0426c011 100644
--- a/dev-qt/designer/designer-5.14.2.ebuild
+++ b/dev-qt/designer/designer-5.14.2.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 9ddaeaed2117..491569ed8dbd 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD linguist-tools-5.13.2.ebuild 640 BLAKE2B 8e3a500949b583f96b4243d1eced0cacb64446a285fda0f10d88fa111f61729585b95ffbd98013d36136b2e4436c2137fd8521de78c076fb7a801445541c2089 SHA512 906271788a46139e398a71afb677a541999d2ada861a8b74c01e4be71c7bc0f704d240d7d4c4418fe3c9013d6ac7c48df09d3a3c40173a5dde74f11d235add0b
 EBUILD linguist-tools-5.14.1.ebuild 680 BLAKE2B bcdd31d6825840472309af44817c112838e7e645ae9fce2e424b9ff5925cbbafe2103a9c079b3e6456ceba2fcc16c2679ce1b602f4f67a64d9206d72fb8f1398 SHA512 080d12cde39c25e77537a2ff4e8c0dfa707a94c9e2d3337f3c5839d2d1f71dee5fbd9dbafd969b0a6b8804e01f61f5115d01e273feaf8d6379a7feac111702b3
-EBUILD linguist-tools-5.14.2.ebuild 688 BLAKE2B d1102039c57f0b6fb140d7b55ebaa8424ccf5d43dfc23839c9d0565a46abe25388e61e11d2bd5cdcc4f416c6c9189d71c99e191d2b33b44d48069848fa565ded SHA512 48404073715709bc1bd7f9fa9fd8a49d715aad242b5aaef00774d45b2e443083dd2bfc9a1203b0cc562dad876493b90899a9ff6aa17700fbc88d4921ee82fbea
+EBUILD linguist-tools-5.14.2.ebuild 686 BLAKE2B 83184ab8c90c600b170744ac086ca1a01c60e926e4def20bcf81dcde75615ac6c945c3b9ea782c80eb5616599c49cc25b2d20dc24811a908924e38de5904fd41 SHA512 6550bcade00923644ed7a9ef1a0a1683f9330ea6ea9b3d6ed6d0f5615f1302c3d1dece68f2b2f5e5a8ff68570a8c84b7e5560f74210c12a990929ff4bae97e8a
 MISC metadata.xml 552 BLAKE2B 210a285385dd5d1cebfa52a89c84e648873f76f57983b86b19e530540b26a518868322d331df0d13ccd79d231dec4abbd63c3d103c160d2fd38aed675ec4ffc9 SHA512 46972372e47619f16e45cee8623310fc3eb31d7490c9df58664e135d4b7be96140789655d7fcc42e472fb598de07c51b7286e0791f413f9b5271d90c9f89b36f
diff --git a/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
deleted file mode 100644
index 9221737f1a06..000000000000
--- a/dev-qt/linguist-tools/linguist-tools-5.13.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="arm"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~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.14.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
index c038a48e8afb..f55c65b6bdc3 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.14.2.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.14.2.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 384c4a1cd02e..ba78ef466293 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD linguist-5.13.2.ebuild 943 BLAKE2B 289b06e939d5db169b6f22755a375ffe08891ed5902abbaff9ef4b1e44dfa6ba22a855b4f4597e26dede2d904dec8b02ac06a5d6461a5a484f6969c1630a43da SHA512 d6338d424050d4824680d73ec2d84dde7d9fc661ee0c69c66270e8b437eb16451945584d05d4111b557c652b508f56bd1b957bbd9b020148daf4300054843fd1
 EBUILD linguist-5.14.1.ebuild 971 BLAKE2B bf2b4a5f2a7526ec0afc66e69e922344f488c1650bf235b5d6b0f43b1e61b4a2e8778196b1f8b4ed03efd582c184101f617bfa7c1942347aa554f438fb5b4d6e SHA512 a49994c5206e2f191b7d384556a39fa72d1d859c85622425df424a6ff68e5c3d55ffbbffdef63dd63e23d3cbb0ac513426f8b832aba129bc501cf40611f8184f
-EBUILD linguist-5.14.2.ebuild 981 BLAKE2B 94b33f5585f2d4f309149010e43ab5b0337a5592dee6e9a76caac22c1959bf35aadb53895711afa4460632dbb8f840dc362845395c6228398361976bbbc8a333 SHA512 d293abb17f6a3a68359474f9ff585c3e8ceb8fda2ea2d0792c7767b22ccb3bf043641f17d29b9d69dcf647c09976d2dba5965730d873cd7e13a0518b8f85b430
+EBUILD linguist-5.14.2.ebuild 980 BLAKE2B 5c4384cc0debe4eca883a6a1ee7f6d1970376cdd93cdb281b86f44efbbc1b210ff6828b8181eaab9ad630266a08b547c15053138e012cdfb7612c331221c54c0 SHA512 87fb35887af582c198cda73330bc5612fa9564a903dde44c4941adb2092b2c7c6f0e1a4e0c359e0a725fb87014b7ac23728e1f834dd854d9e9a1740e8b3efb86
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/linguist/linguist-5.13.2.ebuild b/dev-qt/linguist/linguist-5.13.2.ebuild
deleted file mode 100644
index 97cd2b010e81..000000000000
--- a/dev-qt/linguist/linguist-5.13.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="~arm"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/designer-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~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.14.2.ebuild b/dev-qt/linguist/linguist-5.14.2.ebuild
index 4aa1294c58f7..cfbeb3c4117a 100644
--- a/dev-qt/linguist/linguist-5.14.2.ebuild
+++ b/dev-qt/linguist/linguist-5.14.2.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 e73de3b61ddd..9b4b995424b2 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD pixeltool-5.13.2.ebuild 399 BLAKE2B cc8da4c13f6792cec38a198e0ea02bd35599b3b4b352c27aa10308bf664f1550f3bcf97d1895a79b743eec23d1b5255ef56863847c704b0707b7fe5f55e729ed SHA512 d3b37c3d8a1cbd6bd7eb9af91d410869ebcb7e4a4fac51f974d1cc54f6dd02ece5cfbbc141b794d767e5ab10b29ac28b23f3b6ba966d5c4ea170552e537d8c9c
 EBUILD pixeltool-5.14.1.ebuild 434 BLAKE2B 878d83761489cd6acee003bc590a20f3315ee44f950325576aa87b95be8f2748aa989876ee8f6228ce23f7f2470f852905d8e8f10a54bb6285f3970b57f59ced SHA512 bf61c0e28167cf468fc991337e2807ebbaf6f21c247692f1c8378ac9546c3bef0cb14efcbc70cffed80069290167521537c9f063f57382029a7d719d966f4a99
-EBUILD pixeltool-5.14.2.ebuild 444 BLAKE2B f8c1017fb4b571e397f6b48a86019147b101a22741a0b9a4846b9a149196355a0d83b30d9fee7e77418a6e34f1c0692e3468590693d9f37de4d6ce518a0676b1 SHA512 af368648ae58a65d692380378743a393a62bd51f2196a9c30677b97e34a4129fdaedac4d8a7500f4700bc6c74b8cad692f11c86f892207d01591753926284462
+EBUILD pixeltool-5.14.2.ebuild 443 BLAKE2B 5137326359398cc1b7ce5a12c246d04a4e85ff57cc2e10542619c03550ee470bb2f92bac2125518a230470ca212ac7a797b0e6acd8cbbae7814fe93ce218b35c SHA512 ad472f4c36fa35362fe3589b3ecaede0c51ee3f99f4bb4889f8562ee5695817387c24a3ad4074733610f8c96068440770800e7bd347454a29ad00e8484ae3dae
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/pixeltool/pixeltool-5.13.2.ebuild b/dev-qt/pixeltool/pixeltool-5.13.2.ebuild
deleted file mode 100644
index d5e0a358361a..000000000000
--- a/dev-qt/pixeltool/pixeltool-5.13.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="~arm"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/pixeltool
-)
diff --git a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild b/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
index 2b5bd19339ac..4a19a25b1355 100644
--- a/dev-qt/pixeltool/pixeltool-5.14.2.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.14.2.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 6950111a4d8f..b02c4daa17a3 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD qdbus-5.13.2.ebuild 432 BLAKE2B 8b4c58c9a42a812a5dabd278ed678a29e989e81e4bf88bedc3aab059f3aa688703b7cf53664a17dd776f59765eb796f7abb097d2f228a7df8b96e4bb615152b4 SHA512 42d0d3d9ff13cada6e391ff48ae7cb0b6a4abfb0b338591249c8850eb646b84ba1555c73ce0190bc33cecebb660a9e5e20657374a68d6195d81ac81fc67c8d0e
 EBUILD qdbus-5.14.1.ebuild 471 BLAKE2B bcc4f3cdf2b2de05070bcd9f6a2370ec2e0a8ac30450216fbde37fa20761cf7168cefa4dd515ee4e6f21e3b98c22ed0b3eb8e82617ef2fa32a9d62e101acc422 SHA512 c7ecb744185e32d5d5a53823e9457eb955bc87d4ed426b8ef97c4ad17f490ec1dd24bb4d3cc321bd5a5d92f2f1b37248ae84e7d024b51df1a3871819191712de
-EBUILD qdbus-5.14.2.ebuild 476 BLAKE2B 34f4df2e5943582cfcff2177664f4edd839c8498ecd4efada2813fd7d8050b8b4edf1560932abebb10d75eaa9050c67442a7efb52f56af2918ff2893c0dfe895 SHA512 163d32a8f8151702c8ad0132c00ea2fc175ade4cd67bfcb173e592df5c716863ee798af1480be36d397a21b915a581a9fe873f79db6714d4ce9db2fe9b549fb7
+EBUILD qdbus-5.14.2.ebuild 475 BLAKE2B ed4fd1a10ca7d6e1d617961e9b9f88b7f894ced3ba084eb3cfef31238c7e2992413b5b694ab07c09826c3e201c3ccb19d62a6f883430c43b4febf3b446ca3676 SHA512 b3fe8a92ab09761fca0410f09eafbcd5eaa39473009442660bd0de02581d79534a8c482bf0119bd1744cc87c9645891353f596b802bd434d457f17ecc9a4bbe1
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbus/qdbus-5.13.2.ebuild b/dev-qt/qdbus/qdbus-5.13.2.ebuild
deleted file mode 100644
index 2ff37430f489..000000000000
--- a/dev-qt/qdbus/qdbus-5.13.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="~arm"
-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.14.2.ebuild b/dev-qt/qdbus/qdbus-5.14.2.ebuild
index f9addd8e1919..95cf57140360 100644
--- a/dev-qt/qdbus/qdbus-5.14.2.ebuild
+++ b/dev-qt/qdbus/qdbus-5.14.2.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 7ef78f550d49..baa82e51d24c 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD qdbusviewer-5.13.2.ebuild 924 BLAKE2B 97b3576df8f1bd71ea4f0ae08d055c6f6f7374cad63cce5d81184b292a2432940a3fe7164dafa98e207f528fcff5d48ad512fbcc02dfce1e0990b7b41918c0b4 SHA512 3e4252f593bcc29ec29a749e2afe725a2e6e911296dfba3ca85b6e35edbe6b779109fd83dca53b2947935f9de155da8718fe3fad3e2847e83ea3823b300fc164
 EBUILD qdbusviewer-5.14.1.ebuild 959 BLAKE2B e768bc3d85d1db526d6f852de08eb76df04469f6767eafb3c080796ab66a2e53682e3014e42356f1c1d67488c2a7d4816ab598b56a2f77b121c7ba44523a88f9 SHA512 5f5301fb0466194146cb056aded0186ebb4f3631c6be4e9eeded83f5e6f2d9346190840d53261decf06a081f09dcfafaec998083869ff522c7a9daa40da23d71
-EBUILD qdbusviewer-5.14.2.ebuild 963 BLAKE2B db7f273d2580b43afc158c10b0e487313795a7fa4c3db3e5ca52a20c4801a89b676f0be5a8579c0a16819ad9f65f19b582445d616c3725315eccc5f36551e296 SHA512 240cdfb186a95205d2b548204c7e033ff4cb79f7fc0c33b0a60661ca7d2d0306f42e6a327ef8b633883e55649db8f32536620a26bb4c7b2e5ad17d53d735a4e4
+EBUILD qdbusviewer-5.14.2.ebuild 962 BLAKE2B b759fcb0c42f2923035ecb1b727d1e9260d6e06157f707e0ec423b6732a83c77f3de8946a1b139deec9a5b6152781d1bb05e1d58914b8f4d7a0c46a91a0966f8 SHA512 9f73637ecf0f6b5bb61138a36c29b103b1e646780e8f2899468177d2ca5a786c744f21c3f2cdfd1258e4554e36c6b4d80b951c1d32079480b500a1456e055a9c
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild
deleted file mode 100644
index 95aee18f89df..000000000000
--- a/dev-qt/qdbusviewer/qdbusviewer-5.13.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="~arm"
-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.14.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
index 8ac73f897b2b..cdf04b9d3d36 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.14.2.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.14.2.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 993a562e4ba7..bc01b267f0f8 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD qdoc-5.13.2.ebuild 775 BLAKE2B 7206ae2cc4f83ac2238ac21c1087b3d71f472509e11cc1dee103b7a85cc45796e7492ec48be70338f44a73bcd53adc4b2dbb9bd17d6bbc2ed488ed6b85c21cd7 SHA512 25f1afa4d734fa8060f263188f5512284dfa4ad0fe4ad5017328ca5647efd3c7948f282d000c21dad56f8e2f3d90965cf326f27502d3da88b450283946527969
 EBUILD qdoc-5.14.1.ebuild 798 BLAKE2B 2fbc714f5ad1b1cbcaeee4ef3bde22861fde2ac944aaf62d8b7be62094d385af8d3eb559210dc4b6a0b3524dbd24e2b90962bdca5b94e5b911d307272e884965 SHA512 ef758aa9f4faa40134cc9c52f5f72b506680197e2e40eb8765e5e9eeeee2848423ba55609858f3e4311c9cbe185d56e7275e78ef6fb9558db95bedb2cd3166bc
 EBUILD qdoc-5.14.2.ebuild 870 BLAKE2B 2759828685fe15591e4eb0ddc9a353d5c3f909d21884a0c90b7b50798d749cafdd97c77cce4bc46ec633362bd743849b22c6ec8db552ea0ce4d76393d91e695f SHA512 5dbaf3a693383caa50ec26a98e10e85f0c24b9a0d435a48c2e636741f0810167ae40da4952eb602079e122e28f637ac228c7f5787b9b3904324a799ac88c565e
 MISC metadata.xml 552 BLAKE2B c4dbe379b76afe850e804dfc428aff9f79ed1e2c4344892aa1737a0c61c7baa6c74fc3fa2f07b8132d25a59b0f9710f407a1ba927e5ede20d571ce3f79e8acbf SHA512 61014159b2af5f277f1a7e9d7bc5881da2f04c152adc349de16c60a980f7c76858c1ec3ddfd5760ce1111c81a90482214b03da745cf291c155d4ad50eaa0acdf
diff --git a/dev-qt/qdoc/qdoc-5.13.2.ebuild b/dev-qt/qdoc/qdoc-5.13.2.ebuild
deleted file mode 100644
index 125cde124885..000000000000
--- a/dev-qt/qdoc/qdoc-5.13.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="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt documentation generator"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	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}"
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 57853705a379..240d2b7a73a9 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,6 +1,8 @@
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
+DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
-EBUILD qt-creator-4.10.1.ebuild 6261 BLAKE2B 2348236a6af3e4983ca68a854a61cd778037a1257a6e5c12098a8d60606b8dd242ece67e2414d3bcf18991645bc3d38c34fac65ceb72bfac14a71c7c1ae957ae SHA512 0203dd62a125f0200d86bf895bfd278eb5ad63de350fedfe47645e63bd132cb5bfe4b13a4de8cf0369259cf40ffeb0ac25dff26787a31c1f0eb79adede36ea94
-EBUILD qt-creator-4.8.2.ebuild 5858 BLAKE2B b8f8e59e01ee6b26527ee14f5da3afb5ee2965e019f93611a64d79f7799657fd25c2f5305392480f57fb1d5ab1a5e987edfb92ebdcfe25953e2ff8a681a88cf3 SHA512 046d6ba685fe9df233ef80b72cdfb6954f783df977ee2490d840a43bc69d624801f12cf305499794143b77d3f4c412f462e96c2e58996b85fb5ce46e7777a0b8
-EBUILD qt-creator-9999.ebuild 6390 BLAKE2B a75551b888633de3d5bc10ff390bbed66453fa7b64c780b1a6f121e678a09ee29b53d4a8a75c33694fdd76148721e1aa08b953d8e717ae0698129aaec3b28de1 SHA512 c9fc26c7aa7169be6819b3122b13ca7b4ac2ba9353b1579a17ee314f686482ee15c690716de785a01b4d4279b566c788aff7c1228fa526fb887ad942a9251786
-MISC metadata.xml 3388 BLAKE2B 1f27704c6c58e04867e85e8142a96d449f2a65e5b8dc883120ac7502719f97823468c680dcfcb14831e780b5390ec55a40ecc0b487cbfc03c25bd9b139fe671b SHA512 883644b034ef0a7ade3c0fac6e09f835922192b38c462f3a73f60b08e8c36902ec369f07fee2482c247ddb4d85454e90aeb2c21642cc9309ae525fd349691e27
+EBUILD qt-creator-4.10.1.ebuild 6229 BLAKE2B 9681c8465616bfa0d2ae0c1968285603e6840213c4da1fe34de0ef191c394306c8a935d3080919a590c71bbd04deb6e96828eb95ff691c378696c5f21059f953 SHA512 224693d7cfbddb31bc01ccec252c59e79f82f990b4178bde8aa8d2b647bea8b0b283421cc2e0c2e6076b5caaa430e4b4ac8028ff21f87d0d5d9b24031693f67a
+EBUILD qt-creator-4.12.0.ebuild 6338 BLAKE2B be92f41a4598ed751dd2d328d360bc8c4913f15d3bb6de6d6130fba2764caff9e87a703885f89e96cc9f5af05edc410f06d5182d380a4d565ee67dcfc54982ee SHA512 40f9da93e455e3cd8d7d89d92a0b1b53310f828df154871a9360e1c4a8d10b315e2f7d01e12abb55b3eb8a8799adeb15dcbde65916292bbfe25337d955035510
+EBUILD qt-creator-4.8.2.ebuild 5826 BLAKE2B c3b87e94ae39f69abbefd189fe52dd946dbece17de5a301b3b4a651a683770c5ca58c5f2afcea0237ef18bb0d80e53d69f5078bb0d219f0c114331da5456320a SHA512 7f01324288b26da063d3d1d4d93232f74d0c7a7ad9e481d872a045935265aa1bed200ec24ce2d90469f17bb9da3c7de5aeecb8b8be1d2a04c510c51c533c99c4
+EBUILD qt-creator-9999.ebuild 6358 BLAKE2B 186f2c620c33176dbd83491e9291d55b637f12d07c9b39767ecf4bb2321ca4ad2134831d3c3f789aea36d94e66f6efed896dadd18bf25db055c33b7fbda9a6a6 SHA512 c67d24ea242ffd2a729d36894a6a8511e844ef4a41e1d150a004bac6b23d9b9ff9a6b54f8e96195745c77e3032568a20c4cc36dea966a80094afad57340243e2
+MISC metadata.xml 3297 BLAKE2B 02d12b1d65d5791fe108f75d76f01804d363c933b5b50317a2976d5a3099bf36c2a78d40390a6e16e341b462c7b7a86c0da1f1be9ca4e9cb29ea9e24285227dd SHA512 0597fb87fe7f82c0a4502c0299a0b0d6ab981d8923c1db58f0c26102a93507a8ec75005430a2c538a2621c37936b662a6f0acfc2c7168bc2d608cb3ed44db2cf
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 1d779d44115b..91079b87e4e8 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag>
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
-		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
 		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
 		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>
diff --git a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
index 6d9284c5fdef..dbf469667697 100644
--- a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ fi
 
 # TODO: unbundle sqlite and KSyntaxHighlighting
 
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
+QTC_PLUGINS=(android +autotest baremetal beautifier
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient
 	mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager
@@ -80,7 +80,6 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
-	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
new file mode 100644
index 000000000000..a4ca520e9938
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=9
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+else
+	MY_PV=${PV/_/-}
+	MY_P=${PN}-opensource-src-${MY_PV}
+	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite and KSyntaxHighlighting
+
+QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
+	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
+	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios +lsp:languageclient
+	mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager
+	+qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
+	valgrind winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	clang? ( test? ( qbs ) )
+	qnx? ( remotelinux )
+	boot2qt? ( remotelinux )
+	python? ( lsp )
+"
+
+# minimum Qt version required
+QT_PV="5.12.3:5"
+
+CDEPEND="
+	>=dev-cpp/yaml-cpp-0.6.2
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qtnetwork-${QT_PV}[ssl]
+	>=dev-qt/qtprintsupport-${QT_PV}
+	>=dev-qt/qtquickcontrols-${QT_PV}
+	>=dev-qt/qtscript-${QT_PV}
+	>=dev-qt/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtsvg-${QT_PV}
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtx11extras-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	clang? ( >=sys-devel/clang-9.0.1:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	perfprofiler? ( dev-libs/elfutils )
+	qbs? ( >=dev-util/qbs-1.13.1 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	cmake? ( dev-util/cmake )
+	cppcheck? ( dev-util/cppcheck )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	silversearcher? ( sys-apps/the_silver_searcher )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
+
+	# avoid building unused support libraries and tools
+	if ! use clang; then
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use lsp; then
+		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+	if ! use perfprofiler; then
+		rm -rf src/tools/perfparser || die
+		if ! use qmlprofiler && ! use ctfvisualizer; then
+			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
+		fi
+	fi
+	if ! use qmldesigner; then
+		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
+		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
+	fi
+	if ! use valgrind; then
+		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
+		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
+	sed -i -e '/\(dumpers\|namedemangler\)\.pro/d' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
+
+	# do not install test binaries
+	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
+
+	# fix path to some clang headers
+	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
+
+	# fix translations
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	rm -rf src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		CONFIG+=qbs_disable_rpath \
+		CONFIG+=qbs_enable_project_file_updates \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1)
+}
+
+src_test() {
+	cd tests/auto && virtx default
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}/usr" install
+
+	dodoc dist/{changes-*,known-issues}
+
+	# install documentation
+	if use doc; then
+		emake docs
+		# don't use ${PF} or the doc will not be found
+		insinto /usr/share/doc/qtcreator
+		doins share/doc/qtcreator/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
+	fi
+}
diff --git a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
index b499cf233a8f..9494b2fc37c3 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ fi
 
 # TODO: unbundle sqlite
 
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
 	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
 	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
 	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
@@ -78,7 +78,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake[server(+)] )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e24f4ae254c0..c6649849153f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ fi
 
 # TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
 
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
+QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
 	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
@@ -83,7 +83,6 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
-	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index 81dd819cca72..4307ad7bec51 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -1,57 +1,3 @@
-DIST 5.13.2-0-201910220817qdoc-documentation.7z 548453 BLAKE2B aa488aafc350451d7763c707d2a2be4cde15ffe302eb2ce479fcf4cfb87019256a5a92bf496e790d7ae862fc049d38e60c362dafbe02a6ca177943c5a084f71a SHA512 eeff263785ae3aeaa29b37dddd74c483bee6b3b44b0767a352b000256bfb7b5554e9357f777c76cbd473459eaa0262254824639724142c9a8fe2e85cfbeb4da7
-DIST 5.13.2-0-201910220817qmake-documentation.7z 338389 BLAKE2B 87410bad6d2b940f3aceeda81c6a9f756b94d4ecc9e201d334064137f05df5002bb6c89d8a7913406431e2473b5dc4aa18e39498620f2cdb9f84d12c3c57d87a SHA512 185ad4d70a9317e975776debef6884b34fdb08e55aa5e38ac71e6aeb8843613650faa220c4bc6625fa2cce8e39f91ac6ad628b0ed0b4fb6308cfc078f80c74c7
-DIST 5.13.2-0-201910220817qt3d-documentation.7z 5755434 BLAKE2B e771a881eee0bb309b7e69dd768be1d42a0e6f2944a7d97a32add24bac0efddd7f1ecb3252dc362858e1954aefbe96cca19059d1d28db3f0d129bbad7ce1c03f SHA512 5f92f778d3e458d5b2bd365ae56945b25b2fdd856b41c683b70bc14767ac7d2fade573bdc8eab39aa0af3ed507fd725bd044e2ecbc1265413d10f5109ebe0906
-DIST 5.13.2-0-201910220817qtassistant-documentation.7z 452683 BLAKE2B 5328e086f680a6990b4215d498ae3f3c6d86e1101fffcd672347db589bc3fd04d26b763789a542377e2546c2466767ba1cfec9f9d1ce9c148bd699bbda459d07 SHA512 c24376424e78dd1e9fd6ed5729dddd40f8e585b6de7d16ea822c79802e409f207f1d4353b2c5bbec20f0cfdd3b1021a27cbfa2b17449ab14053bbfecb597291e
-DIST 5.13.2-0-201910220817qtbluetooth-documentation.7z 2151622 BLAKE2B 3a0f572226bdf0a9905f79ef52eedb93cf99a2ee280909ed985d4987190944a7d76e1c1b47e3aaa1de96cd1eccc095e246e4fee6811c134c7f9ed8c836508eb8 SHA512 30454adeb873aacf34bcf5cc371a0bbe13028140ca21d94663881fefd795e18cbef7da26e488cd1ea71323d301a39b7e9a02957682c7f1aace305d828e069818
-DIST 5.13.2-0-201910220817qtcharts-documentation.7z 8753331 BLAKE2B 619243031102c851f12e893b13f816dc603d5b8bab7178ba519ecf4924e097abd72cc1563e2108ceb2e8394b4eeee00f71a921fd076f389222ae3321ec829c77 SHA512 285396a5482d6f2cf8a989dd2fae7b26813b0405769f0287ddb1d0b314b60886a1a8151164b13213a4b5239f7ac257010f3187f1b4d1f4beb01d5c7a883b5472
-DIST 5.13.2-0-201910220817qtconcurrent-documentation.7z 123127 BLAKE2B 9e7c4feb7624d12d18fba8ccc1e0e3f4c584cf0f909cdbbc4c3b09890a5618af55b9d21eba72fc103fd4bc8f6e1844fac4bd05e386c3f406d5f5ee937b258199 SHA512 5100ecc37667d1297efb8e38a9f5daee29587b3ca480a19befc600c2ea9bf2b21e493f6d9370ed6ee6d73d78ac9b8883f6fddb26dd64cd492a3d5567d3a756ee
-DIST 5.13.2-0-201910220817qtcore-documentation.7z 6506991 BLAKE2B 8d285ff2e3f8df749eacd51bc30afb6c3f82750d9e94cb652baf79f491d52346ed13f49abaaaeabbfc3dfae6fc499566870b2de51177270e23192d455945b760 SHA512 7565ebc95f8aa11aaf68b6315d799bef36b2d4bf252ffac78dc47c2d307e720472743881cf946aa85e73626149ca7ff6233f4a1c765c91cac349342b330439c0
-DIST 5.13.2-0-201910220817qtdatavisualization-documentation.7z 6129034 BLAKE2B 07d72db5ff110c89159ee5a3fc28e3bc16104d877bb8c2ba831bd6326debdcff9be6fb36c3fb0f2ccc6c0e5d20fd5f4d915e08804e41ff95dbf58b8c3cf6afc1 SHA512 2fbf3b901bae51ffa693dddb0da6674870d6666816d3e0342104bad73d78f7a33660bae13020e87578b3ec300be1ac2c99abdf3a41f4abce7a90436f61bf346b
-DIST 5.13.2-0-201910220817qtdbus-documentation.7z 402466 BLAKE2B d3f9d76231fbe8a8befded0f268d44f4d1084a443ba120b39fcac9b7752abaee5fe5969126de59a2c343f935dadbf43e8be3a04af8171c5ab870577d583c8e97 SHA512 7c30d73df8bc3443284c840441d3876fee8787e91eb0f1748064017613032ce144c08ec21c142df26933bacf042f0908f2996d78df5d042baf3c66c2d4fe8029
-DIST 5.13.2-0-201910220817qtdesigner-documentation.7z 3539734 BLAKE2B 6e0804696bf917ed971adcc525ae80bad3eda045e3b216ae19e494a6c11d80d168beda7c67b2a26ba1640a9eb473d03e1fb1d312f889971740ff9af7fa2c4c6c SHA512 0d3a85dfefdac0aff7ec0a4e4b8bf4ff1b9a22d9dcd3d4108cab3bb8fe10c7c35ec297cb2a7b3717f53991ef74705793fbb9752e188cd7653205e44fa173e93c
-DIST 5.13.2-0-201910220817qtdoc-documentation.7z 9849520 BLAKE2B 7436289bd06da76c72be8292bdb46ad8cea5ad5fb06f2690ed4cca78ca12b7f0497679d516bd4fc294c547ec6f8cb2578e13064b29632764f9a3843018d53963 SHA512 0cf52234e4bd37c542f390a6ef70612c240320104deb66047895f90a1b18c081427d3f70ffbab9103c4e12afe8ce05132096a7e4d05a47c7fe6224ee566a4376
-DIST 5.13.2-0-201910220817qtgamepad-documentation.7z 241475 BLAKE2B 963c430969490b702118e320923d75024febf8ae30d4f93b0667f6bef799eaf153bdf3f52f1062261ffdec8cf2872fe3a3eafb5b85c76e63b422b008d547e94f SHA512 ec96f8109419f2f9484ac3ec6e349b24a62d947e1767d32e4b71226466225d8912b3c46ef6660fc94e38b4336cf882051d1bedf36425567cbc30e134b8134c78
-DIST 5.13.2-0-201910220817qtgraphicaleffects-documentation.7z 15994225 BLAKE2B bdae9500e68402437e60a820aa205fddb5f650b9ee1ede9900bb93b94612e06c24c39a665efe2c2ff3bd6c729827fbcaa700b5fa8fd902100c6ce3f5f3cbffe6 SHA512 88be49f9b261be7c758bbc3c7d8537c66888a7cbd4474dc8a6924622154481c028b80de7993e1b35392489e27008bf7f425d27816cc56996526a83d14be6b134
-DIST 5.13.2-0-201910220817qtgui-documentation.7z 7356053 BLAKE2B 2243b4a292e3cfa555f37175b291779b9d921216765f639f981105d3351793914fdaec52b8bf8fdbd7d243f2b4b1400b594eb1e99be63d2b73f6b05483921023 SHA512 343230266351dbb1d7c3e788c67cd5f49b4f158e5b41c9d0c499510f556dc43796136412b1c1bd3ecabcadc415369c248054d517d2df8c5b1b16999db0ba5232
-DIST 5.13.2-0-201910220817qthelp-documentation.7z 205750 BLAKE2B e7925fc327137ede96b43147be8313181cd5da00c231f2f782a407b5386cf818829d819fea36bd04ab1a21e0310f8c303366e5fc619c1fc7752484af248dbaac SHA512 2bbd4a5fe649eea8f976ebb9e06bbe8668c3582d16ad46d6206aee152888b72e2c49e5b2d01949a688719be74b550c34c0c2ad5539a36f309f4a288c19ceb55e
-DIST 5.13.2-0-201910220817qtimageformats-documentation.7z 29224 BLAKE2B 7016771a1f64fe8b57f0714651b86c26e8da66454a0288f502f6637b6087bf32dbc6056336f009a36865737cfe2f82dbeadb4fcee6559d84db14317e2c7996c0 SHA512 a4ec9b740281516b5df72584f5221bdf5d856bb90ea117cf019a8de7168a53099f7d303836cccdbced88d3e75f4dad5153fae2818a22fca50dfcb058917ac8bc
-DIST 5.13.2-0-201910220817qtlinguist-documentation.7z 969124 BLAKE2B 0ff7fa764ebd6f81ed5f815d781d7f97946fac3f269193dd557a546f69de356ded6e1eb4e36c17e70241aba6f0df64ee0b551458eb766c4d8f3761b7315a8839 SHA512 5cafd4a9ee7367a03256e9921a7c01d43f90f65608b7d4ad78851eeaa524a29e2184ecdc36970b79cb07d457bbf7a55fea63e1f51bd40ae5ea6e50c127f68bd4
-DIST 5.13.2-0-201910220817qtlocation-documentation.7z 2779052 BLAKE2B 3ed200927093cbb5a966e436c1d92d4a04af6df3a9b9267f1eb262878ac7b182cbad63462a9c26a959809040349801187f8dc50727dbba1a9cb205cc63936f92 SHA512 05275871ffb73b1a47567094bc7375d58fcecf5028d7f50687b982ecbdea6aa013876010dc4fef776dca7f81722902c35844cedbff28a23ab88948ac3514f797
-DIST 5.13.2-0-201910220817qtmultimedia-documentation.7z 2839015 BLAKE2B 59f759ae4779caa513900d3815710e6af2447b39754ea63455562a73523a40637d025e6e27ebc13d02d8d18d534fec63c3ef81567d777b300a2e62c65ec9a4f2 SHA512 2f94cbf0e3422421f25515f2e1a7d4c0ae727a28cbf944464466b216809bde945e4633b9fea3e85b53e5f88bf39adc3020faf1f7c6a9977ad6db507fb8eed4e9
-DIST 5.13.2-0-201910220817qtnetwork-documentation.7z 1504278 BLAKE2B 7ba1299c9e625fe092fc814b298264c72e74ac5db0ea712e1e1c5b8b93bf4283825139b4a3ec73cc3e16cd911a3e8c7343f8f3298fcf4d16c63627a755e204af SHA512 2bee2b9980fc23892f17150599a7d3a3addc2a085eb61c31079e3fcbdd2dfce1a74b87683a5eae5729f16000ac567d5eeb8c5ccedd1f9f7aa4ef58d067ac80ce
-DIST 5.13.2-0-201910220817qtnetworkauth-documentation.7z 247446 BLAKE2B a56e4b3d7143c0d1ef06953902f218f18c8a7b4cd42594338ee3e23e476704966a846accca8062652229f4fa02e2716aa5354bac6b427325d5af69b12e076c68 SHA512 bade635e1fdde5d57a3b3ca350fa2cf8080c37fce2a1b7f7ff36fd170129b0ab99970fa4f9d96dc7539ce687a56135e477d4b667b140ed18901e1ad26241191e
-DIST 5.13.2-0-201910220817qtopengl-documentation.7z 840074 BLAKE2B 82fcfeff6331544e37fc99014c25f121809baf45c1c46a3154b7025bb392ef174bf2872ee06e9ff4e91a4930c213e0572cf587b011e8eb3585251faf78524d77 SHA512 6bbcc851a8f720a275825d07e84efdb2b4272316618d9f1c4b32eef891e3e9e2e862cbce8be350a7bd1549190f87d570ec24486d2a4af397ec633f6f9a1bd348
-DIST 5.13.2-0-201910220817qtplatformheaders-documentation.7z 79580 BLAKE2B 6198666faf655e52f6b3a7ca23a6786f5b9e723480795fc522133a3761561981b88421a48c0d888686b05e5f05afaa88e2be6d94ab1ef3b44745a0471b794cac SHA512 f8cb8f0a156efbccd9b174602400d3037af53238237d83af1fe717f873936aff1c5ba9eac73e73e5971205858095888af334e2adf0fdb9c1ba6ef2361bdcd107
-DIST 5.13.2-0-201910220817qtpositioning-documentation.7z 577066 BLAKE2B 63f32656af419ef64260d43fa05dd3994ffc7af32d43be7bebf0e4d55e7c5229b8df506820554d9b82d3205a9c8c7974a87766f2c1c7736d1bf6221d43797244 SHA512 1deac186bc9862ad87f0cb9a386816d43fcbcf41e4cfb7f8310b1602407bb58a69fda6b00dc85c3e72ddb91f4712d451149d0ac2a60040329216ec46bac9a8f4
-DIST 5.13.2-0-201910220817qtprintsupport-documentation.7z 380281 BLAKE2B 194c56b8e3a0d1a6ba3d6a419d34ab6aa5f03cdaa7af858fc5de1bbddd0c627fed689aef24976bd59b632f19c11a8318ecabdb1ecfd1e3761dfd65c5abb3bc63 SHA512 55565bc6e12996bd30a86b40e934709c81a19a1093907350e8af9b5bc137e0dcffcf3f376e68f805e8825fa87e105c04bd46b4dde82cf54917b54753a1dea0d5
-DIST 5.13.2-0-201910220817qtqml-documentation.7z 1692747 BLAKE2B 9aa33ddf13d4cb41b9746c4050a8f3ecb9892aef9bba81b1f36141f21aca8449130a31fea09f245902d2c1896d07a9dfcb50026dff9fabe77e804a6ae8de4840 SHA512 89dbf2ed24031dcd17f82b859aaed986556f25307378f7d420940d647340d8d8d3fa42fa7e7b8b3dfed90b36409dd29ca3c1381e10ccd646d1aae243a8e9baf3
-DIST 5.13.2-0-201910220817qtqmltest-documentation.7z 81839 BLAKE2B 629477b50c7b0d56eba4a4a49080574efa59ebcf1c8a82d0baf6013007e622a8aae5ce9ce278fb15eb10a8b9d19a5183927c320ae12a32430ba1468a772a0773 SHA512 0a622b81cbf7d87fbbbc2cc6a53e6ef55d8633e7407234f03b7bfd5c9a7f1230b1c2ff553f7ff309c04c807b613c028124c8ea5185a4753bdb74caa300a02991
-DIST 5.13.2-0-201910220817qtquick-documentation.7z 16083391 BLAKE2B 2656ca9bcbcdc78fb6b8f394daa428c463e29c9d4bf58c63059503c4cb3f3cb8cd18e955801452ba3dcac2f762a5e33044fcfa710f82f92a570c427a5147f095 SHA512 0ec79fc539d6199b342c8d3857a05f791237fc29a4b63108172678450632e175826b6dd922ddb55c35f4176490420469d3c6f197e3e3b669a15b29ebb7617426
-DIST 5.13.2-0-201910220817qtquickcontrols-documentation.7z 9639185 BLAKE2B 7bcf62a1b8cb5ef54e168fca1437371d28320d2c9bc167c733e2ae0d2c8e4b6a3f8ca61302fa094a135244c253cb3ca0a6f75a5b795aec873bf66b6ddcd6f27e SHA512 c0967f3df7912ed0d3ded9eaef6ef63902f7d60d4b444ad318974918a00f89551a8181aaf9ad6cb0e836f28d6b890a239f65795b98d77ea15c9f920f01d7db78
-DIST 5.13.2-0-201910220817qtquickcontrols1-documentation.7z 1951053 BLAKE2B 7b78d6507cab2ad43096cb44238cc2bbfc44d1812847430729cf0d7f97b3687807b5b4d10bb1c2e926223d7d7405d3b6a6ab5f8464a77de207a9ca84b9f3f8f8 SHA512 faa5a0b069a4bd3fec706d7445a62c058eec5fd36b42dd17b3b10ad9209e0f67c50e38ef93f5f4b74dbe4d123e7eb938aa498279d85515d1f29f876e2a73f895
-DIST 5.13.2-0-201910220817qtquickdialogs-documentation.7z 183783 BLAKE2B ed7dee0f30daec7c87ba35f5edee84284530ff73a8fc2f2f62b8b9c8a428d8749d22a58db2c5b23dfefdfed1bc9d577be0be0f2a56adf0fd17017abdef014731 SHA512 177839f2c328f6bffccf01e302f87e7e31ab0a469c3537974011839dac3be33ad3ced21a4c1f596818535fbd7d54d6c8a6afb73f23b15d6a81338aaebfa3e855
-DIST 5.13.2-0-201910220817qtquickextras-documentation.7z 675111 BLAKE2B e50a24bb23291ee5dc951569b0dfa2bcefd6ec8b7f7234e96a71f192683e6b8f04b5dddeecc47a3bb7b509de8250e0633838d033e4f4cf3dbb54c76430079b03 SHA512 74ac087842712ed409600647a4ea95d89af49239ab8cebe73ec25aff56a791ddb5555ce64a7b90005a23468dcce688cd5352cb59667d9068017a941e195d0701
-DIST 5.13.2-0-201910220817qtscript-documentation.7z 604440 BLAKE2B 3b9db2e786831df3b5ba9191c4fc359258a9e7be0d89829baaf4ed2e73ae37e380fc9d408dfd7c6adc9dc68cbc00f86d4dc6a58265272839cb79ecb73c743ff9 SHA512 b9c8d92eb8c8395d43dff8938c36b380931077d7db95a25f227d97dd224e98cb92b299b8bf4049c0de77f74dd31184672733fb8121cb8ccb9b7163ff279fc24a
-DIST 5.13.2-0-201910220817qtscripttools-documentation.7z 87987 BLAKE2B 5c9b11520574b6981da069ab6cdd8cd7ef1469145f67122950e72165890cd96ccb41d85d7ad7682a2bb3f1eddee3ea1d914d61ca52d76ea74c398e6abc094ab4 SHA512 901f9b3868b72dad0216e996f7a7b6b6a916359092dda68ef39c5504893bd6528a55d65397e50a8751702b0e894ab228ff859747079c73331dd5425b72e457a5
-DIST 5.13.2-0-201910220817qtscxml-documentation.7z 630325 BLAKE2B a0a4edc2c5ba1c1c4c3056a84a47c80df574fe373c3aff52e5beb64e399e44345c68617fe19f7eb1d2f590e833221d0a174591b1da659c8e9f4da19d025c2a2c SHA512 36f22f6a865afbdc89daaa038c2a48314cb8c88adc891e21d7f5504c49714d897e2e0548fcfdcef25fc974fe08dcce706b1c0d3d123c9941e8f014e8a77505c3
-DIST 5.13.2-0-201910220817qtsensors-documentation.7z 3442555 BLAKE2B d8acd96ef44f4adb4fe2e9e0a8218d181baacb90a6f18487de1bca38d96adcf2ed3f3b5cd344d9d806a3d739deed7ba0474b58b4c2ddf9bef8318c9aae81240d SHA512 9eb714d498b4e5d3de0b5a8464a2f8cbecaaf25cade7a4cc414b64619039f304370042affaa8f8fa1c10835e1cabf68326132f0a5a7643471e38e474289d9e23
-DIST 5.13.2-0-201910220817qtserialbus-documentation.7z 370376 BLAKE2B 4bf90413026746bfc097acb137a67de6051578ac0fc0cf911fc39c45b77101a6a45b3b6726a4d13d69331cbc7f699c148397c29df471a620004ee2535aa73ad2 SHA512 ba6a64e79d2198d447469879f6faa2d922bcdaaaf18ec193dfea0032fa2a191ce37f9a87f7a147a3e42d01baacabf57bf1746ef4bfcc8d4079b0d9437d806853
-DIST 5.13.2-0-201910220817qtserialport-documentation.7z 280639 BLAKE2B 2a860cccc0903b252b9b1af4177a68265ec5eac2e75b744e45322fe6e3008289009e3ed2844805bad09a02f0d8aa3eda94232272db8f60efaf932f835820c63b SHA512 347b309f225092daa4eb9236730527811c1d11b02d93520be22a35dea81c1059fdc775316f0cabb7324557e67ddaaeca55affc75f8ef2a90c0e7c10e512c02c4
-DIST 5.13.2-0-201910220817qtspeech-documentation.7z 135920 BLAKE2B f7509d5432a1844a1857712d96c984ee31d451964e69360cc40fd5e60af65809257457eb483c36539daa67ef9cf1d7157f1e74bef871750baad6666ba820849b SHA512 7df2c8db6da5866d50505ead1d37424de6429192b7dc1fdd36336674a7cda3a6df1d68e4f0bd9fcad23498eee4f73eaf1c5f93ba5405ff97a9416ebd7ee73983
-DIST 5.13.2-0-201910220817qtsql-documentation.7z 886186 BLAKE2B fd5506255fd359c4f28e79f818b877301baeb37822d1434aaf9731717f2f6a0f72b34ae4a0caf2ce2bbc58865b2220110b5a753e2b95512b7e8ffc73bae0810e SHA512 c1383978be772a58503182843f55dadb662e76155528dbb4e15385fd75840dbfcfbf32aac613a9c3ae7aa122b24eb539b45fa3d61c5a2939f477490828257bd4
-DIST 5.13.2-0-201910220817qtsvg-documentation.7z 255113 BLAKE2B e25458f8db4ff20ac0bc4d5f10cacf98203e61923867043187ff40f0f50075152f60840e142a4c88dc315d921f04f7fcf566941699f3623f85c5087be7acbc7b SHA512 6df3309068308fa33bfc02fe648207b62a63e0801d8701219fc8ce874a5729f2a41128894cf8fec49f17bcee6e4bbc7d852e0e7c87f354ca8ff061c703ea1338
-DIST 5.13.2-0-201910220817qttestlib-documentation.7z 193587 BLAKE2B 91789a185fb7b04b92e8c952ca50259c9a6eb8f77221987e0805d2142f86adea9a2bce3dac86789f45517551fdf645c3d46a69788dd24d0e9fb0d61893521737 SHA512 09d8cb51c074760dbdce4ae298be2429b65b8ded5e553317702f68815c823792bfe10fd2042f454c50d096923a5acbc004d79a671df891115175ef2720afc5f7
-DIST 5.13.2-0-201910220817qtuitools-documentation.7z 159548 BLAKE2B b60a2e59ff6d1f7e86a9de92b0a2847134f07c9bf50d2eea7dcef010c18b418914476fc3b72b17de2e112fa75f30e561fe93ef6298d4534874ea075a7d4edc5d SHA512 435b84457acea9e96d47166ecf74bc910a60cce4abc665b463b0fa4c2dfe024177a5179fea99187c1566659e278a64e07d5596017e713e42657d8153ef4ddd66
-DIST 5.13.2-0-201910220817qtvirtualkeyboard-documentation.7z 2041906 BLAKE2B 5d8788765f8531e436fa833c0b7c9f6e9e12327a74e11c5fd44120de8c134429da5a6a4eee76f3e9f5b19f0cf2d99ecb345099331ae60dda25a4e3be8bad7ddd SHA512 2fb1a9de652a1854cc1e87b50be6d5f09cca33de9af1c77a5e93975de10c46873aec7cad5c740124d7f06f5956f87fdc6832cbdbb0190b6cbd47fbb28022eee6
-DIST 5.13.2-0-201910220817qtwaylandcompositor-documentation.7z 574461 BLAKE2B 46aea96978ca5db2fc89bb6984bb0549d0b0ba53d330ce75fdceef0543922335978133abda948843f1bc185f265850f18a7b12ba34bc811e37932dc5c0e8fa5c SHA512 ee38d0d1a9da34e8fe1cdf4462be100bc050bd85ac60c4bd996cbdea8bb6d15498d9ba6b6858d670d99d4e2e812407f9a70eeffbc30d472307e18157a6ebc7f3
-DIST 5.13.2-0-201910220817qtwebchannel-documentation.7z 163055 BLAKE2B 857d3c2b301b354ee1b7df77708ff9231f973bc8b248d05fc8e88912f6dc601d604e70d06697223df3b0aa8c38e60c29d4b7fd7335188df90bf308676bb03643 SHA512 35b1e37bf57fb56822c8ee6a8d6e0def332b04e54a1971cf4035d844c647ade33149485bc4c6cd0d55d358f0379bb2e8a7a6eedf46d5b6103f642a9ab038d2b5
-DIST 5.13.2-0-201910220817qtwebengine-documentation.7z 2922302 BLAKE2B dc1aae739204a7a8e7dab9e00ae8b4d8d381de5aeec4cdf6c26fe76ed05af7f7ae50c5ec6823e119c9fd3719d414401dd0b696a2846805dfc75779b69bd3988a SHA512 a2c2b363bda84561fb7d85cfe2d7db6a2878a4276260b174e45c25b98f61b17d88dec0f68e32229475bb8ad28381e68e7a626e50bb1c0ea62f502b57c7d6aa99
-DIST 5.13.2-0-201910220817qtwebsockets-documentation.7z 307734 BLAKE2B b49996106fa1b3b2d70e80c704b6fac56edfc661a164b7486be872ff1f7aea15d85d7100f1e7bbf3abe642e1920d789133360d0187b2fedbd338b0ad36a532ff SHA512 5d35640067a06fb47e4191d49ed99ba15886e03f3b443fb9596776b64484789983346edf7af7b8537123ac6382a200d9420458e030474d72c2eeffcee0bd278d
-DIST 5.13.2-0-201910220817qtwebview-documentation.7z 120175 BLAKE2B 70b1c97cc2f72eb261d0169b81a57e305f835dbed8cee04d4887b5d32dab5845b13a3392e32827e83aa0cd0133f5255d3cabf7e02105450ccfc2167ac425c795 SHA512 0f042a9b87f0eb86f0d09549b2fe58ec2ec06088dccd875e4d25d333aa22a0d2f45d95c88b07e6e6da092ca26ef756bfa81996dc873271c8685f7af55e6fcf57
-DIST 5.13.2-0-201910220817qtwidgets-documentation.7z 26848590 BLAKE2B 3f7aa08eb24417d28081c447490acfb8312f49fe4921d993fcd20eaf9bf77571835e06f927bf371de031dac3ec2010c2eca07b7e7e18222709e25866b5d02def SHA512 fb25ffcea51200996a441391f78586fb8edc43bf965dbd22ede35ae88e3b146fa7be16f7385737e6dc7ed5e951d6b43f5bb35e3099ccdbe5e63db8b7c8f9de8e
-DIST 5.13.2-0-201910220817qtx11extras-documentation.7z 36829 BLAKE2B 1f6d9304edca4d1629c727932cefb1f0a577972414520bf67d8289f051f83e485c61b6783c03f53e015c6b864ba0e0d8af0c9cdb184d86787962e6394702ba0e SHA512 7c600dba66e1368013e79658fcf7044227a5efa35d17482eaf2874069f5c56ef1d945f37aa50b1c0f3d588ff6fbe3998726b1ea4501de80c913a66555c9a5adc
-DIST 5.13.2-0-201910220817qtxml-documentation.7z 504822 BLAKE2B cd32a16ea5b0d7ef78f8009900c87af88af2b83a920952ebb2ff71e3000df82bba3e2b7b75d000222b57eec7014f7deb25c4a81d4fc4ce3bcce89e80440c1e60 SHA512 0caa60c8f9a83523cb3f19169483377480c722a7ea1b47ae91078b061b31676414175c91640c4d8f7587ce5ebc10d2e3e43b82b2f38e438c0968031c66684a0b
-DIST 5.13.2-0-201910220817qtxmlpatterns-documentation.7z 1198499 BLAKE2B fa8033e8b50f1706e8c74d42abe8162ef457c17cd8a111a72db493fae55020f259755e985e6cccbf40237022f18f791cf5191e14f80456233a3f320fed128499 SHA512 db52ae797eacd3d36f4c5b5b982d4df81e05a7a7789bbcb0bacf6629ffc0987c883c1b7bba060824cc7859a2d1f674022b49f52bc68786f0dc879ecac942bd55
 DIST 5.14.1-0-202001241012qdoc-documentation.7z 547862 BLAKE2B 001b243fef7acf2b706e2aacecd6a6e26605f8846d4076aa456a9bf320e7244762910f35359c062c5d4d48dff85d3a3b0086a190d82afe1b1b6edebeeba84482 SHA512 87571e525227a8968af58850365af322fac972e2d4ff1d5eaa6917879ef3d2f4539284c3f437dc6d7a5a0b5181862ac96d2ea85fa6f5d8f15461e29b8aea15bd
 DIST 5.14.1-0-202001241012qmake-documentation.7z 338666 BLAKE2B 64c5e395f4063cd85d16384897911f498b1a892870d85af8b1d44a4c5828514f7581485b7a55a224dc2374c1c4b53833bd2b15f40641e57ee393f99b02f0c667 SHA512 dc7f6f2dc131a63babfe31b16f4841ff69458739bddc5ae7531cc0bbb8f7fdc9c897668a126cbd9f063eea2d9dde60decb5ec575fec05727c00a1a4a1134cff8
 DIST 5.14.1-0-202001241012qt3d-documentation.7z 5836354 BLAKE2B 158ced6af92e54dde53feb6841b5b09b212cd0354ec75fb0a0f44a32ae0cb16ae29fd0dfa19f6dc8cfbf06170f39aead862adb412f76e19f9b3f51ddffc670a7 SHA512 42066f62135e0443261a0809ca046c8d256caf0146e7035353559bdb28491283cdb455947ebba1632fe2f2e37b0fb09db1c978d264ab2dc9799ba438ef193668
@@ -160,7 +106,6 @@ DIST 5.14.2-0-202003291239qtwidgets-documentation.7z 26796173 BLAKE2B 6383a2be31
 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
-EBUILD qt-docs-5.13.2_p201910220817.ebuild 2592 BLAKE2B 9198ee2603c38dfc9b5be33b561011dc34d9d91ec2d480fcac9cb58768dcced8f88311544d42f87db7db4872b4c0bf314e4ec1e91461016f5ae6ad04a91f293b SHA512 b4908d83b1000b9a8ac498022c83f32cdd1bdaf1a7884456e03f4ac1913500684f0c76acf8163bf1860a407c4e7f530fa14d4647733c0a4430802fa08da5513d
 EBUILD qt-docs-5.14.1_p202001241012.ebuild 2620 BLAKE2B eeac4625f8b870c9e7103bae92a6bd91c8155989cd3aed593d4fd96710834d50028c534ead8e8b67575922607c9fef5553382332df886942b438fb39000f6694 SHA512 d11db026689561e4697a05135771613f622c78b7b862895719d503775e41e83a5251613494d090e1e8fc1229ad33c6d93e4489cf0d635f126418263c0789ead7
-EBUILD qt-docs-5.14.2_p202003291239.ebuild 2623 BLAKE2B 748f5f5dafeb000327f719257efec906078a9c6bf8cd809ca38ca35410b3243e5a0f6eda30a0fc221d70d445a152256a5dab3f25e67dc609380d114f4db51dd8 SHA512 8887bc7cb952fbf275c1a608609760b272abab2730d270a3fbfc759fc8b9a0b6774b152e912126a11597db7d58ca67817a5f5b2de9ecc308ee9692cfcde8be99
+EBUILD qt-docs-5.14.2_p202003291239.ebuild 2971 BLAKE2B 662b11ab88d36ed1335eb1320dacdd0242db8d3a028fd06eb18a339fc3af9ca873eb896b0b9a7aef82071d54929b1aa522d3b45c4e7af9411f19b39ba26a3e69 SHA512 6a868d567e6f140d95200b37510f442cf35c319100d9365ea9cc9a0db2927a8fda3880486d1a87951c16543ded3c8b715cef94318cfe60aa9d3a01dd66a48953
 MISC metadata.xml 3896 BLAKE2B 9ddb79d566a10dffbccfc8fca4f970c1a49b1d2c3f6885474d1919e1647a403877c565b186da92a5823ec49c0e4af92a4478643c608574f2e3b5675334bef2aa SHA512 6418b810cf78d5acee499340352b30589d483c8be74a9412cf9c7a43534b7c5d37fa9e2d5a49e2be079d40e0120e738fac21132ccc04f64aca12895bc3865c80
diff --git a/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild b/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild
deleted file mode 100644
index 166c2fa7b517..000000000000
--- a/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild
+++ /dev/null
@@ -1,89 +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="~arm"
-
-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"
-
-S=${WORKDIR}/Docs/Qt-${PV%_p*}
-
-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
index 8beec6556c99..466a8de3c9dc 100644
--- a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239.ebuild
@@ -77,10 +77,23 @@ for DOCUSE in ${!QT5_DOCS[@]}; do
 done
 unset DOCTAR DOCUSE
 
-BDEPEND="app-arch/p7zip"
+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
diff --git a/dev-qt/qtbluetooth/Manifest b/dev-qt/qtbluetooth/Manifest
index 784ab71ca9f0..c2caa96390f3 100644
--- a/dev-qt/qtbluetooth/Manifest
+++ b/dev-qt/qtbluetooth/Manifest
@@ -1,8 +1,6 @@
 AUX qtbluetooth-5.14.1-errno.patch 812 BLAKE2B 0246a5859242e328116dd12dbd5eb8968e04cf7bac3c7496eabe6e52a4320b06ac995d918abb30ae9b8c86624b329f6e466dc913e3be384d58cdfb9454221ec4 SHA512 a8549108761466100a7db26ccfc4748603533bf1ffaa2e1af9ae21dbd345a727d8ea9f62f345f706e53bdcda39e5464f7b3629ad53260ee11e72bd8fe1d3c979
-DIST qtconnectivity-everywhere-src-5.13.2.tar.xz 2777504 BLAKE2B 96fa60f6685907a2f6a97548bea70551dfd5fb2a1a3d4ffe5b68fe6629f90a52cacb29432f6f64caf8a7426238a37222eaedd515502ec3ade85260e5689b17ca SHA512 ec5269430ce548911f9af44f028bb8032163827d588da6914e9a721ad833277d88bfad43b1cfb4f844443c7a2af6cdbcf2951a339a127c22274612a4e3b90f38
 DIST qtconnectivity-everywhere-src-5.14.1.tar.xz 2803040 BLAKE2B 0a13fd0def6d65c0dde5a13a4c53c3ea4b8aa05da05c35093658a6de8ba30e28a6ead9a72c7918251ca3613ac7d7c498434051bde540b8a6780305c1895ee3e1 SHA512 bebffcda3949d798289fcbf8df99afe8fecb6bf410de3fca278f4290f561b75f667ac1f929e62ec423a56c3d80db06ce53d8992f360201e05ed6953af07ceb1a
 DIST qtconnectivity-everywhere-src-5.14.2.tar.xz 2804940 BLAKE2B d72e1159877049865d45c5aea8281fce87d797bb41cd82aac534463f48752f8144d018a9a1a23d153adc41b64559c0aa160c00ad1c30ce7790abb11f4ee1d87f SHA512 948050b915f6f2e1fffcb2c8b55d9061f25a82314d02e7a39faa9b88e065bb924ce5f8a7c26ed1f07b29b986d47acd5678f57bb96668d1c1ecd93ad3a7e40c7a
-EBUILD qtbluetooth-5.13.2.ebuild 618 BLAKE2B a176013b15b535452bbe4017dbef879a36541e7bda9262cd676663e5da7fe6a750d7c526e5da63e5a75738230359c5a241f34c4e117fd2a87f0a83694209db7b SHA512 973aa63e3e0794a5b87768d4f4c9edb7820d7f107f387ecbc182f9159804f2c88eba76f1dbe6d6d50c84fe6ff3f7f5ba2cd25baf25565e6080c226ebf709b8e5
 EBUILD qtbluetooth-5.14.1.ebuild 679 BLAKE2B 664a6893b8c9cc070e4a31576edb49ab7f30f94e8f61302cfb0363de11cc9fec753b698ae5b68a4f20fe9353389ddffc33bb2fed8d3747f943711122405c390e SHA512 69659cdb43e363275814ff0a1565d10b550bbbe2499f54c6c0b73cda95e672a03be3efa656b71a95d04ec4f2f1e2ed6755e7b9ff2d7db7822b8d36b71ed2a17b
-EBUILD qtbluetooth-5.14.2.ebuild 638 BLAKE2B eb466960d85f88d33193b5df81afa005536657725bf9ecb4210325f8767bdb638dc0c65ac14975f4ad5eb518853e10a1a06953207f1122a8266c0da78ecbd27a SHA512 ab17fefe047787d4b024d894846e2d8c42030d45008d8b0a4b6ea533c554a98596ef3d5dd13861250c319f461c77ec4878ec7b8767c4b97c6fd094db1d1bef12
+EBUILD qtbluetooth-5.14.2.ebuild 637 BLAKE2B a61f299e67b2b690926c97f6f593959bca15d4a9669c5b629351c8341655b358d23038bb13e2570a9cd1bc504bb9858575370c1c991ba954a0df993407fde5db SHA512 e4753e98c948b900a013f1e596f289ca1f8c4ad257da88a4b29fe5805158912858b551922dbb1cb483286ab87fd11b7edb5e6be50c928b8daa7461c8a3242744
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
deleted file mode 100644
index 1160a5f5d385..000000000000
--- a/dev-qt/qtbluetooth/qtbluetooth-5.13.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="qtconnectivity"
-inherit qt5-build
-
-DESCRIPTION="Bluetooth support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="qml"
-
-RDEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~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.14.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild
index 7ded615ebf54..4ba2d115d967 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.14.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.14.2.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 ~x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 544d63d27ec6..451571e1834e 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtconcurrent-5.13.2.ebuild 398 BLAKE2B 00512f90f3d80ba9778d89e517b266c0b56052224684932c05b54665463982dfffc67fb2d898a4502251c0cd89b6ad401d7eb3ee97c620160d718370ff74565e SHA512 729084da4bf2260c7da260066f6109009dde850f438476935dd8dcb04dcd731c25ff16c24b1daabde45e1f5f8e8b1c2501f91e8fea98fcea012905867e1aa03b
 EBUILD qtconcurrent-5.14.1.ebuild 438 BLAKE2B 804c6e9a3cd6d14bca1d11efb96d5433eb4be64395914ab42a585c542943429c63440f6ce198f9788bc60da675fdad8cabcd4ad3b0dbbf9ebfbc15a2b0b9f529 SHA512 70e97cf4202fc0705bedf54858c9f5ecbd04d2ca57ab8f70c34e7b1ec8ec7858408e08609692576757398f05bb310e5aad46424ac682002504024f164ba9ebd6
-EBUILD qtconcurrent-5.14.2.ebuild 446 BLAKE2B 60a97fcbc986abcb826e718545f2b7b71efbe2a7f2d2dac335ee04ac931f345ae3289743fc6102a53ba6a7f090be6545ba1ce826704ee84bdf2d162d8f63ea8d SHA512 4e7205e74298d0cc803b1dbca02489e6bc74be74a8dc7a167fc197165b2a1d9bb2e17c3c03e9dcb0f74656ad3b52695164be670895288d5525646387fb4be354
+EBUILD qtconcurrent-5.14.2.ebuild 444 BLAKE2B 2601e5e3efe50dd8f6c3f2651e4d2c2aef01d5b92b1f74d587bfdef4d910615540ef8069b6e489001232ab912b51a0d0907e505fa879de2c957cfec3a23d2da1 SHA512 6a28302822c50ec8a4c9517186be2af5760879034c07f7c54bd3367c992cea3481e744a1f6507aea794212bd274764f8d7fdda83c9f770dadd390f23f17dc702
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
deleted file mode 100644
index 3a3f3d4cb8bf..000000000000
--- a/dev-qt/qtconcurrent/qtconcurrent-5.13.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="arm"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/concurrent
-)
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
index c484cbcb1761..150eb8fadd28 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.14.2.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.14.2.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 2d9c73d0ca71..30f23c3905d9 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,11 +1,7 @@
-AUX qtcore-5.12.3-CVE-2020-0569.patch 1103 BLAKE2B e19236089dde2c6e15ef3f4c53e8cbcf8e68b09d0f61570adbb5e62a449c647e1d51c185735d2086ca336513d51eaf43d3c414eebaf9849cbe9ca3bba33a675c SHA512 721a16079acba96e784713b092543dc187b1c041889da745228b625ae727b602279ff882054929320cabc4228f47233e50fd63fcc75f543d8266f8fb0a043809
-AUX qtcore-5.12.3-CVE-2020-0570.patch 2539 BLAKE2B 87282e51d64cf94cbc33eea6da901bef2135f0b25237dccb72c5f5f107f3270e5286fba15ba413d4e04d3cfa109934c97fea32f8295b727d38f047ffc85b28c7 SHA512 ed05b2efffc96dbd263dfb2714f45190b7bb61a17ff7395ec3d136c6fae2b460eb40a751df615d15394a7b22a989b3163cd1441b164554613aaac4de90cb873b
 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.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtcore-5.13.2-r2.ebuild 1728 BLAKE2B 7e1130362b13811416afa3b8b3ec8a89c82a6bd290c33ccf08a6940183a20519f87bfaa09a9a4220ac9e6de6bb2e36e0bd2566b2e896ed903b23b178b08fec6c SHA512 c16abdfcecb671e0f6e95294bc7d804578821147a129083976e896f8d76e7701689fbd8c4f0dd0990f62c4fc4757ef6ee10597eec2ec79d192e916e2511c32cb
 EBUILD qtcore-5.14.1-r1.ebuild 1711 BLAKE2B 00fa1e8969c3109494a67376892c7331ca0f5a33a806165bc1950f7d66d1a9e094863950427249be89bf0b65a5502c523c0c72c6db3a72080600349e4bd69d7f SHA512 04615c1b40db89986f207cdd61180f84012cbd2d551d0541c7812b5670c0b58a2d0f5337f7ee685ef2dd37ae70db5482fa9a477a7d8f7cd88808fbd989ec7fec
-EBUILD qtcore-5.14.2.ebuild 2248 BLAKE2B 9e683aa79a045f1988b0c9893107bc9c8653103bc242454ba93a0ce30d98133a50a390669a72332a30f6f56a60ed8c48edfa8b2a7b6f2ba0c6e4f3531809df24 SHA512 6df482ba952c943a234660830e3f659bc1edbf26fed1117ee95cf051281c7019cf2c2cee0b411127ab0ff296ec92b6c43711c1ee6ca125b8460e5259716faa86
+EBUILD qtcore-5.14.2.ebuild 2246 BLAKE2B 4b6eb940437879e5d45305011cc7b7d654dc0e87aa7827f9efacee5e738f350a05421966c3755f979b2e2e85b27398954e1c6df3564094dd71ed1909192aa6c5 SHA512 12ccdff3bd9f6b8f2ecbcc9e3667f426200162c267f34308be28496bbf4c227688c54cbe832552646c08bc9c8bf26e22c1b07e53377a09054f725150ea133819
 MISC metadata.xml 662 BLAKE2B daf4dcfc7380ac0a25155b5a04125b4a4038ba7fd84fe8e98a9782a9cd7f886c608a21edc9b81a3af791eb22faa4a1bf1cd63f6a2f60a5b0f19d681b59313403 SHA512 571811795b3cd171751b1571ac9e601d5a0d78e56c6257546965496e94bf6a26eee6ad04972e5d01e4fbc92a248d325912f4e0bdd13e5adf3928892bb93b1d12
diff --git a/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch
deleted file mode 100644
index b0e5b564e2d8..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0569.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
-From: Olivier Goffart <ogoffart@woboq.com>
-Date: Fri, 8 Nov 2019 11:30:40 +0100
-Subject: Do not load plugin from the $PWD
-
-I see no reason why this would make sense to look for plugins in the current
-directory. And when there are plugins there, it may actually be wrong
-
-Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/corelib/plugin/qpluginloader.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
-index cadff4f32b..c2443dbdda 100644
---- a/src/corelib/plugin/qpluginloader.cpp
-+++ b/src/corelib/plugin/qpluginloader.cpp
-@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
-         paths.append(fileName.left(slash)); // don't include the '/'
-     } else {
-         paths = QCoreApplication::libraryPaths();
--        paths.prepend(QStringLiteral(".")); // search in current dir first
-     }
- 
-     for (const QString &path : qAsConst(paths)) {
--- 
-cgit v1.2.1
diff --git a/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch b/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch
deleted file mode 100644
index 1f6b2dfafecc..000000000000
--- a/dev-qt/qtcore/files/qtcore-5.12.3-CVE-2020-0570.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e6f1fde24f77f63fb16b2df239f82a89d2bf05dd Mon Sep 17 00:00:00 2001
-From: Thiago Macieira <thiago.macieira@intel.com>
-Date: Fri, 10 Jan 2020 09:26:27 -0800
-Subject: QLibrary/Unix: do not attempt to load a library relative to $PWD
-
-I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to
-find libraries in a haswell/ subdir of the main path, but we only need
-to do that transformation if the library is contains at least one
-directory seprator. That is, if the user asks to load "lib/foo", then we
-should try "lib/haswell/foo" (often, the path prefix will be absolute).
-
-When the library name the user requested has no directory separators, we
-let dlopen() do the transformation for us. Testing on Linux confirms
-glibc does so:
-
-$ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor
-   1972475:     find library=libXcursor.so.1 [0]; searching
-   1972475:       trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1
-   1972475:       trying file=/usr/lib64/haswell/libXcursor.so.1
-   1972475:       trying file=/usr/lib64/libXcursor.so.1
-   1972475:     calling init: /usr/lib64/libXcursor.so.1
-   1972475:     calling fini: /usr/lib64/libXcursor.so.1 [0]
-
-Fixes: QTBUG-81272
-Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
----
- src/corelib/plugin/qlibrary_unix.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
-index f0de1010d7..135b82cd37 100644
---- a/src/corelib/plugin/qlibrary_unix.cpp
-+++ b/src/corelib/plugin/qlibrary_unix.cpp
-@@ -1,7 +1,7 @@
- /****************************************************************************
- **
- ** Copyright (C) 2016 The Qt Company Ltd.
--** Copyright (C) 2018 Intel Corporation
-+** Copyright (C) 2020 Intel Corporation
- ** Contact: https://www.qt.io/licensing/
- **
- ** This file is part of the QtCore module of the Qt Toolkit.
-@@ -218,6 +218,8 @@ bool QLibraryPrivate::load_sys()
-         for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) {
-             if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix)))
-                 continue;
-+            if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/')))
-+                continue;
-             if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix)))
-                 continue;
-             if (loadHints & QLibrary::LoadArchiveMemberHint) {
--- 
-cgit v1.2.1
diff --git a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
deleted file mode 100644
index 97af29b9ec1d..000000000000
--- a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
+++ /dev/null
@@ -1,89 +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="Cross-platform application development framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="icu 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/tools/qfloat16-tables
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.12.3-CVE-2020-0569.patch"
-	"${FILESDIR}/${PN}-5.12.3-CVE-2020-0570.patch"
-)
-
-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)
-	)
-	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.14.2.ebuild b/dev-qt/qtcore/qtcore-5.14.2.ebuild
index e1f44b0b6e03..beb1fea7928f 100644
--- a/dev-qt/qtcore/qtcore-5.14.2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.14.2.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"
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index b54ad787f7e8..bfff2ba5553c 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtdbus-5.13.2.ebuild 642 BLAKE2B 5436f145c41b65a2d2b4744284cb2d25662b3ed06462bd50b4e4bdd5c92d37b536b8420572d2f2ff6ada55a2fb717af51ffcc5e61e0f234bb078cf0ee8723c92 SHA512 de9ed995499bbaae33f653c2accd920e90ad34a9d4e7e080977b6c09ae6df9180974f3651bb22b772cb17792214c221543b40415a28d4a998bff5099de641ed3
 EBUILD qtdbus-5.14.1.ebuild 682 BLAKE2B 7f921facd3fce1832d7db96a39d8ac1460ccf16f8792ee673053e9afb1634afa21dc22b8db9f73f63dc2511362cc7cb56e06effa096e7a28672469bb6801fc1d SHA512 8ac36b382477cb7a545adec4c9b425b91e1079048ca16758fe53b9f52f3ec0fb52ce0e9a06ed13b2e8609ece7103f02c26f46f7bca87ad0fbb528c9f1ae18a8f
-EBUILD qtdbus-5.14.2.ebuild 690 BLAKE2B c05fa4051750c9007e616f8cce01b32d0b1061bada85b5a90a2f146db7a0cb904e1d9f5aeeea8a15dea05f09a05cbcf48758f288ffaedcb47195cc533911926b SHA512 dcabbe196e3a3401e0c7aa998934a3cb819e69ece7706709bdf8c9dc8aa6c10c76d0c28e249b41f4df3265d8263f72e1c18ca98a95ff133c36a112e8fd4128ac
+EBUILD qtdbus-5.14.2.ebuild 688 BLAKE2B 4ff32c5eaeda8eba709d8ea4f16852dac0e722214d059c721653972c04a2fad8d543aef1fbd304c727476696046a14de610f4a10c185a5e0bfaae657c24935c2 SHA512 afb6aebf9efe3c82273babfe36baecb04508a0146be184edb928d4cc03206b13262fe25418f4cc34320e807edc8027b64ada4ab6807277b3947267d56b997b9e
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtdbus/qtdbus-5.13.2.ebuild b/dev-qt/qtdbus/qtdbus-5.13.2.ebuild
deleted file mode 100644
index a057a8edefd4..000000000000
--- a/dev-qt/qtdbus/qtdbus-5.13.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="arm"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	>=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.14.2.ebuild b/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
index 098360958680..30eefdf4145f 100644
--- a/dev-qt/qtdbus/qtdbus-5.14.2.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.14.2.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 3960dc10f693..9c5d8c8cc49c 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,10 +1,6 @@
-AUX qtdeclarative-5.13.2-fix-deadlock-on-exit.patch 4042 BLAKE2B 9ad28ad2e9157d63e18da3c807db8f6c7909a87e82d4798ac7c5ada592a0527f44223cb94f6cf527f7fb34e3e2f3bd6fcf250a44b420500a4d3b4bf7d5ece586 SHA512 6a0d8f3b3d9cc53c23d8ca5942b266d95d1d94a1045d7125c97e23724522913d94bf8b8430d501a2a1f8d39a50f74cf673a63ce5437caa582cfe12e7b525ad9b
-AUX qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch 3348 BLAKE2B 54a263b72e7010271b5ce2fd8ed687ce19270cdf27029ea515a34795b036cae8f582e6f7b1ffcb815be660ac81f1b53b93918c3bda098f614cbc3b51ea80bb60 SHA512 e71ddab29cf35fa4cb1334147b1c5b6771860e68fd1e2e4958fb6cfb1489c567b0d209dfa1ba5e56119e5a61ee2039e8f3af75bd410ab187c2d61ac74a8c0b35
 AUX qtdeclarative-5.4.2-disable-jit.patch 547 BLAKE2B 3f9cc85ab9ec7c2b79aad8bcbfe541ba51745f62e3f02111a2f455c6d1a7959c7980284e3a655ce8335d4a166d65570f2b9d236c681d155c015cc14dc3bb54af SHA512 cd410c0e731a1e096bd8a77b7ecc769a5e3503f7a2f12668f2f4f1c3099973eaa2060d97708962e422c580ee76ee3db3712834cd994b7e1aeeb57c0a4c3b0b3d
-DIST qtdeclarative-everywhere-src-5.13.2.tar.xz 20940748 BLAKE2B acc688691a86318478a3f016821bf6e84ba3a552e4f8613414a51ecde8e588783ed80e53eed31bbc321945950754991d20a29290e9cf3b878c5415d1049be3cc SHA512 a3fcc65eccdd598c03991978db6462293781abc80affd9a489253d4a812073832554892d503fa0de32a9ef97ddc74b9ad71e2bd7cfa2f21ce1fc64d1358ab730
 DIST qtdeclarative-everywhere-src-5.14.1.tar.xz 21299728 BLAKE2B dfa0dfc95956f9c9eeb6b790e0221cf745b0cefd89fc070caa741b9cdc644acd990128affbcef6ac585758a02f94b1693ccca77d9de080f04f4d1b6d2304537f SHA512 70094d24a977a5ae4a3a11ee31e49234592faca1ec8195560977e7834778d1b1fdc2a30e555dc6c43c98cef2a39d5c1bf6351093c0f46b9b22b4127f3bebef58
 DIST qtdeclarative-everywhere-src-5.14.2.tar.xz 21305980 BLAKE2B 0ccbae8ddc46f4891af6732a4b3cf874c523c7ded5a06f78c7c5cd290fef8e32ad6efe5dcffe947024144128ab2f1108594e4a30da9ca79e1ce3008c73ca2a25 SHA512 48d3a547237514a8bdc2a4c0b3f97732abceacece0e0899d2f33787293eb99f54c28efce35a34b8c46dcd4d78ebbc88bfc820bc68496076eacace40aaceee004
-EBUILD qtdeclarative-5.13.2-r2.ebuild 1273 BLAKE2B 3198750bbd5d219f909223b8ddcd0c187f6e31d5489c67eb6c00f2c747040c7b93b5f1c2317b000dc89b8acf7bfa9bbcb1227e8b1528dd3bea5fa281be84f0b4 SHA512 5ea00b455cdb92ee5a3418e2ba18300c4e77bcc9c536cde02812754d0cb2276c4f5fc8592868b52aa2521debe8bcea83eef5a267660d61ea3ae3f6d5f700177e
 EBUILD qtdeclarative-5.14.1-r2.ebuild 1178 BLAKE2B 7f39248777ab4d62393d935318575fb69473e50b2a5794015ed5f5ce8adfa0012f60cd174e512f7aff76aaf27d568ececc8a2fb7051117f2ee690e71b5067af4 SHA512 f86b6074b37a635d1fb53b7c94ab47ba6a8558a9cf2a49f9ffc7821e8f507be6ab4972f8a14fd6fde89395f004bd3f277b68ec27c90eddd386ad91ea8ce7dff4
-EBUILD qtdeclarative-5.14.2.ebuild 1190 BLAKE2B 674b96f1bf9ab7e675644561be68edf885d7dda7d7fb5a37550d68384ed9eb939d726dd8a1992f0caad1d220ffdc5e1cbe707cb3d69bf85cbe76f612b3d049a3 SHA512 3d0c2134af6d7bee98ef5c2bfe34f26d7f0a0091d9fcae452d1cff3cf3e144fe4203ae43a2585f290848ddd67aebc9808a6ed8a5c712abe780a166ab103d5694
+EBUILD qtdeclarative-5.14.2.ebuild 1188 BLAKE2B 8ac2d33ed385990e892dfaf8198d75875a77dee5ec493a41b02dd87a4fdf9fb347c50b635dbeb698e978d0283abbf07a0eb1071f4e05b7da44d5468f9f3eca50 SHA512 20f724f73cc3b57fc51cb228fa86170569d3df3eac0dba11e6b857d15d3e04a4ba8e52d96cc53c94e7d660bcb9f0c40cc95408ee27fa7cc300e195bebf759c75
 MISC metadata.xml 700 BLAKE2B 80c5bfdd7c6acd05795c20b36d062b76458fc4b3f83835eef83ed2f304e70dbae9dfe81908bf33e41fd944de4cc754e5f839451cf4c8ef4f06063817730b7cf6 SHA512 f1fbc57d96dc5b481d08da8c73ab9d1e183045ecefeb075a7ee8f1d6733583589077e3650ad5b2d52e4cafc67bf0894ae62fd4500e1974053e46d6a89377f3fd
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch
deleted file mode 100644
index 09c4ad831c54..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-fix-deadlock-on-exit.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 73ad6e87bbeceea5830ab3a6b3dc66fa99e30f45 Mon Sep 17 00:00:00 2001
-From: Fabian Kosmale <fabian.kosmale@qt.io>
-Date: Mon, 28 Oct 2019 13:41:11 +0100
-Subject: [PATCH] QQuickItem::setParentItem: add child earlier
-
-Calling (de)refWindow can trigger QQuickItem::windowChanged, which in turn
-can call a user defined windowChanged handler. If that signal handler
-were to call setParentItem, we would encounter an inconsistent state:
-The item already has its parent set, but that parent would lack the item
-in its children list (as we would only call refWindow at a later point).
-
-Fixes: QTBUG-79573
-Fixes: QTBUG-73439
-Change-Id: I46adaa54a0521b5cd7f37810b3dd1a206e6a09c6
-Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
----
- src/quick/items/qquickitem.cpp                      | 21 +++++++++++++++++----
- .../qquickitem/data/setParentInWindowChange.qml     | 12 ++++++++++++
- tests/auto/quick/qquickitem/tst_qquickitem.cpp      |  8 ++++++++
- 3 files changed, 37 insertions(+), 4 deletions(-)
- create mode 100644 tests/auto/quick/qquickitem/data/setParentInWindowChange.qml
-
-diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
-index 396012e1e67..26f02aeed7f 100644
---- a/src/quick/items/qquickitem.cpp
-+++ b/src/quick/items/qquickitem.cpp
-@@ -2748,22 +2748,35 @@ void QQuickItem::setParentItem(QQuickItem *parentItem)
-     }
- 
-     QQuickWindow *parentWindow = parentItem ? QQuickItemPrivate::get(parentItem)->window : nullptr;
-+    bool alreadyAddedChild = false;
-     if (d->window == parentWindow) {
-         // Avoid freeing and reallocating resources if the window stays the same.
-         d->parentItem = parentItem;
-     } else {
--        if (d->window)
--            d->derefWindow();
-+        auto oldParentItem = d->parentItem;
-         d->parentItem = parentItem;
-+        if (d->parentItem) {
-+            QQuickItemPrivate::get(d->parentItem)->addChild(this);
-+            alreadyAddedChild = true;
-+        }
-+        if (d->window) {
-+            d->derefWindow();
-+            // as we potentially changed d->parentWindow above
-+            // the check in derefWindow could not work
-+            // thus, we redo it here with the old parent
-+            if (!oldParentItem) {
-+                QQuickWindowPrivate::get(d->window)->parentlessItems.remove(this);
-+            }
-+        }
-         if (parentWindow)
-             d->refWindow(parentWindow);
-     }
- 
-     d->dirty(QQuickItemPrivate::ParentChanged);
- 
--    if (d->parentItem)
-+    if (d->parentItem && !alreadyAddedChild)
-         QQuickItemPrivate::get(d->parentItem)->addChild(this);
--    else if (d->window)
-+    else if (d->window && !alreadyAddedChild)
-         QQuickWindowPrivate::get(d->window)->parentlessItems.insert(this);
- 
-     d->setEffectiveVisibleRecur(d->calcEffectiveVisible());
-diff --git a/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml b/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml
-new file mode 100644
-index 00000000000..d68b7adb72a
---- /dev/null
-+++ b/tests/auto/quick/qquickitem/data/setParentInWindowChange.qml
-@@ -0,0 +1,12 @@
-+import QtQuick 2.12
-+
-+Rectangle {
-+    width: 800
-+    height: 600
-+    Item {
-+        id: it
-+        onWindowChanged: () => it.parent = newParent
-+    }
-+
-+    Item { id: newParent }
-+}
-diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
-index 7e132f97b67..9ce9766c925 100644
---- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
-+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
-@@ -197,6 +197,8 @@ private slots:
-     void qtBug60123();
- #endif
- 
-+    void setParentCalledInOnWindowChanged();
-+
- private:
- 
-     enum PaintOrderOp {
-@@ -2145,6 +2147,12 @@ void tst_qquickitem::qtBug60123()
-     activateWindowAndTestPress(&window);
- }
- #endif
-+void tst_qquickitem::setParentCalledInOnWindowChanged()
-+{
-+    QQuickView view;
-+    view.setSource(testFileUrl("setParentInWindowChange.qml"));
-+    QVERIFY(ensureFocus(&view)); // should not crash
-+}
- 
- QTEST_MAIN(tst_qquickitem)
- 
--- 
-2.16.3
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch
deleted file mode 100644
index 63f4235c9e7c..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.13.2-read-QQmlPropertyMap-correctly.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From bcbc3c9cec1f7d7bb8c9d5f5ea94eb5c81ec2853 Mon Sep 17 00:00:00 2001
-From: Fabian Kosmale <fabian.kosmale@qt.io>
-Date: Wed, 30 Oct 2019 10:15:23 +0100
-Subject: [PATCH] QQmlProperty: handle reads of QQmlPropertyMap correctly
-
-Fixes: QTBUG-79614
-Change-Id: Iaf84c0178dc88072a367da2b42b09554b85c7d57
-Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
----
- src/qml/qml/qqmlproperty.cpp                     | 12 +++++++++---
- tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp | 21 +++++++++++++++++++++
- 2 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
-index c8166695bad..a394ed1ad9a 100644
---- a/src/qml/qml/qqmlproperty.cpp
-+++ b/src/qml/qml/qqmlproperty.cpp
-@@ -63,6 +63,7 @@
- #include <private/qqmlvaluetypewrapper_p.h>
- #include <QtCore/qdebug.h>
- #include <cmath>
-+#include <QtQml/QQmlPropertyMap>
- 
- Q_DECLARE_METATYPE(QList<int>)
- Q_DECLARE_METATYPE(QList<qreal>)
-@@ -331,10 +332,15 @@ void QQmlPropertyPrivate::initProperty(QObject *obj, const QString &name)
- 
-                 return;
-             } else {
--                if (!property->isQObject())
--                    return; // Not an object property
-+                if (!property->isQObject()) {
-+                    if (auto asPropertyMap = qobject_cast<QQmlPropertyMap*>(currentObject))
-+                        currentObject = asPropertyMap->value(path.at(ii).toString()).value<QObject*>();
-+                    else
-+                        return; // Not an object property, and not a property map
-+                } else {
-+                    property->readProperty(currentObject, &currentObject);
-+                }
- 
--                property->readProperty(currentObject, &currentObject);
-                 if (!currentObject) return; // No value
- 
-             }
-diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
-index 27e06c6f674..ed213cd01aa 100644
---- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
-+++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
-@@ -37,6 +37,7 @@
- #include <QtCore/qdir.h>
- #include <QtCore/private/qobject_p.h>
- #include "../../shared/util.h"
-+#include <QtQml/QQmlPropertyMap>
- 
- #include <QDebug>
- class MyQmlObject : public QObject
-@@ -149,6 +150,8 @@ private slots:
-     void floatToStringPrecision();
- 
-     void copy();
-+
-+    void nestedQQmlPropertyMap();
- private:
-     QQmlEngine engine;
- };
-@@ -2106,6 +2109,24 @@ void tst_qqmlproperty::initTestCase()
-     qmlRegisterType<MyContainer>("Test",1,0,"MyContainer");
- }
- 
-+void tst_qqmlproperty::nestedQQmlPropertyMap()
-+{
-+    QQmlPropertyMap mainPropertyMap;
-+    QQmlPropertyMap nestedPropertyMap;
-+    QQmlPropertyMap deeplyNestedPropertyMap;
-+
-+    mainPropertyMap.insert("nesting1", QVariant::fromValue(&nestedPropertyMap));
-+    nestedPropertyMap.insert("value", 42);
-+    nestedPropertyMap.insert("nesting2", QVariant::fromValue(&deeplyNestedPropertyMap));
-+    deeplyNestedPropertyMap.insert("value", "success");
-+
-+    QQmlProperty value{&mainPropertyMap, "nesting1.value"};
-+    QCOMPARE(value.read().toInt(), 42);
-+
-+    QQmlProperty success{&mainPropertyMap, "nesting1.nesting2.value"};
-+    QCOMPARE(success.read().toString(), QLatin1String("success"));
-+}
-+
- QTEST_MAIN(tst_qqmlproperty)
- 
- #include "tst_qqmlproperty.moc"
--- 
-2.16.3
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r2.ebuild
deleted file mode 100644
index eefc20c74e48..000000000000
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r2.ebuild
+++ /dev/null
@@ -1,58 +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} )
-inherit python-any-r1 qt5-build
-
-DESCRIPTION="The QML and Quick modules for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE="gles2-only +jit localstorage +widgets"
-
-BDEPEND="${PYTHON_DEPS}"
-# qtgui[gles2-only=] is needed because of bug 504322
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=]
-	~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}-read-QQmlPropertyMap-correctly.patch" # QTBUG-79614
-	"${FILESDIR}/${P}-fix-deadlock-on-exit.patch" # QTBUG-79573
-)
-
-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.14.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
index 5e3c49a6f3ca..9a43f954fada 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.14.2.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.14.2.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 7cbc3cf999de..0d067e852721 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD qtdiag-5.13.2.ebuild 688 BLAKE2B 95257e0d23ec2874b1fd888b4d74a108c11c8cd09ec76bed28f4f88ce47226e47dbda330a57783ffadd18cf5f52532c9b205aeaf3f11b866bbb6ec8c1a38f896 SHA512 475b21502dbd1b5bbff4f120355093186e4db4f857645940644505724a895b674dff83f8223ce3f9a462cd0f76f6c85785d2076bc60ea7a4b82b9a0b2c4131cf
 EBUILD qtdiag-5.14.1.ebuild 720 BLAKE2B 8a1767e2e0bcd178f44c6b0309112c26b1d8714098674eae92923028ddf5005ec95c8dc5e2e03141e77e80dd256881280216fa1f280abe2588815e054c86eca5 SHA512 402e0ce8f3f7c2ab7bf3907f1a488488566cb75dc928ccc7add1f011eab892eb24847cf233add52a311d7c27d35cca2352a2b902c57a5fd25ad8a62840100ee7
 EBUILD qtdiag-5.14.2.ebuild 726 BLAKE2B 325156d07ec726ed74be4dcbc37eed45470f753220f23f7c218727d818b3f99558015200734b5d8c43f83487148634923e7ce0212479127ffc47a0e094cade7e SHA512 67cfff6486c82786f0ec24a8c4e3040b63ea3f84ad63a4469c890ba6ccf74d8ba5924fdc6000000956b4221707dabed1f623a15aab95b03b267cd4e4137b57e5
 MISC metadata.xml 615 BLAKE2B 209daadf88db89100f444845c1369b5c3a73cbdc9da13283efd0656e12a8f3c3820b6a53782b734673898590f2e3d872f655da33fb1d1f601762225a57f18cb2 SHA512 c80d22c8b91b519af2864a9fe55a027951f9f8c743767445bb315fd68ac2a6ea8302abac88ed854477659e911e0d7ecc24ff872da4198ab04aaf5e4d5a4e8587
diff --git a/dev-qt/qtdiag/qtdiag-5.13.2.ebuild b/dev-qt/qtdiag/qtdiag-5.13.2.ebuild
deleted file mode 100644
index d66741ba7111..000000000000
--- a/dev-qt/qtdiag/qtdiag-5.13.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="~arm"
-fi
-
-IUSE="+network +widgets"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	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/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index f75892d64a2b..8029ad2cc40f 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,7 +1,5 @@
-DIST qtgraphicaleffects-everywhere-src-5.13.2.tar.xz 14845928 BLAKE2B 65564c0b94bd50f26ea59c0e63286561c4391dc79f48969fdf5d7a6bcffcb5011d39fa36220c1924211929e6f89baf06878668998467840afb29010b9d5b5d44 SHA512 3cc44d345df2b6d8dc54fd7f94f5632acb39cc6be6966c791303a477c2d21e8650f50ae6c5e37803c6f81236b7607096dc9fdee847fbef115465370f7a0ace2a
 DIST qtgraphicaleffects-everywhere-src-5.14.1.tar.xz 14040704 BLAKE2B 48f84503245496bf0457ea2d31098c2b6d47adb7b7d9afd80837ca02af1710b4cebf0d0bdd5cfa3b6ce95f3921436ebab1e46624e42ce907351c72939e27f183 SHA512 82e3ba00d58137c81be333347970e9e7e8c3301d171792d1f362cff6d5badb7d8148b7748a54d5efd5332f315989f2838638a73d960a8ff3ef875683414880c8
 DIST qtgraphicaleffects-everywhere-src-5.14.2.tar.xz 14040880 BLAKE2B 7fe0d534b9365e02c6a9499a7d0ef5d2e87a9c46819f05ad5052a23400bf90070b6ec9e7aad8a76de63760bea7853c29a1e01eb055956588f46347525a86f2e1 SHA512 fa6ed3eff243675f9d0bfa71b2886804e4902cf9d7d91d5dec0f8e4f060ee7c347ba7775a89e3f8effd0ffed8314f916b55f09056902abc892ee27e79ce2925c
-EBUILD qtgraphicaleffects-5.13.2.ebuild 411 BLAKE2B 6a6815f45ae07b15ac3ce5c09ec52397331c9952e6159f9cabdd4944d8e9ae45a28ac18a5644737fb186a3c7fc9a654803cabef30e5662efd3a6c0e76e345f8b SHA512 d5f32be1129ef2cb37acaa4f0212af314a509207e50238469c816528243560c305ed7ba0245e5c353dfe6f8af48fce5ebba3e57b58421d4a54e8e1c1e25ccb99
 EBUILD qtgraphicaleffects-5.14.1.ebuild 443 BLAKE2B 1283105c3a8c25d7e23c3b97778325c65ada123fc0f4eb1cc2a033f084419049a628adb8511aa0d3e5d437597c2c6c8e601824241aa993466a100113e9a74e73 SHA512 53190cf51f5f0217831220c64d4c4a6e9c6015c26692dce8c8a7950ccb6e775c28e1ec7b2a9609080726a37cb4cbcad9af17457ac51ec42866975e7beff246c6
-EBUILD qtgraphicaleffects-5.14.2.ebuild 448 BLAKE2B 2e379ebce1e569228f5f82004779c0f6cb1008b239558dddfc192a09d2320f53574651c862cac214a84f3ceb6a2519d6c6d29a46fc425701d2d0f4bbeec3cd5d SHA512 caf74fee9a7ed9454daf1645d43ecd59ced44f43e6856f2b819f84a3025d4d5549021088beb346af36f3f3786e1263a8dceb30643f5aaa991b19944ee2b398cb
+EBUILD qtgraphicaleffects-5.14.2.ebuild 447 BLAKE2B 232cc9df2722fb66271fac764c4e0e87365e963bbf9198a86a54a7ad94a4db3716f688a4bce84c4bb58acbe370804673a42a410eca76a45aeb581dd9a1c12fbd SHA512 5dbef5c424cd07771afd0a22ca35383b4723ed5371e08e140ab4d054ca9de346b293e8a616a21a6405aba8efba7b28bf660993d2ac1b7ee3946867d15990b34f
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild
deleted file mode 100644
index c330dfbfa970..000000000000
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.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="~arm"
-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.14.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
index ec75dc760768..e6918e11bf4b 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.14.2.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 11f54e1dd1df..618c0e754ec9 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,10 +1,7 @@
 AUX qt-5.12-gcc-avx2.patch 1038 BLAKE2B cb54308c8ef4df9efaa8727ba292b7e959ae069237f8dbc6c7432556c4697f0263dca098f348b0afe94cc93359f929c564c8201a60d585b5907b6bd497369e24 SHA512 0eb51d41996bf42bc896eef53d2e335777c6c6f56fe027581f8b636a57759c98b3f08a5330c9fdeb0054aaa1955024140b161fd19c6457cc66fe68414b1cd8ff
-AUX qtgui-5.13.2-no-xcb-no-xkbcommon.patch 1327 BLAKE2B d51ed6761d300aec44fc9f1ac86c6f26649fd28f9dfafa0aeb8de4d5b8bb64c46697cfa2089f2a97a22e5cad311c7b372aac12be16c83b3932f2686a240d25c9 SHA512 71433f589554e2fef82d73cf112d7b5d2e2454ec5e3560878d0af05e6721ce4919623175c9355be7c54568da26c68e8c9dfe6cc956465e005b01e3ab974cb310
 AUX qtgui-5.14.1-cmake-macro-backward-compat.patch 2555 BLAKE2B 5fe2b70232722416cb85ecce8a0742b57503c520482aa0386042f43d4cf20926a874b9a92f90c656cfe0bf93883c286b6b08c0ad2568f3a6746c776dcf208995 SHA512 c7ba0bfa6d462504ba9421abfb7f502265fd8c6bd7469326612925cd7b7667daba3350f714aa5a516aa83e5352ec6d18fc02af9ebf5494af10a4b6f8f7c47d5b
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtgui-5.13.2-r1.ebuild 3840 BLAKE2B 9d71fe389a8661e350cde868aa2ec190d1f9fd94f76183ac7d611e0d328e037ea993959f498337a4621f86202f148ad876dbd9c743626c745e7b5bbd01b20a69 SHA512 e90ba27502e65a967ef27dd4348a6d71cd463e86a36ae76d524ed594e59c83ec7da0c01a732ff8e40312350ea55fddae08a05567fc2d6e0bd85a545a0e2fdb69
 EBUILD qtgui-5.14.1-r4.ebuild 3983 BLAKE2B 65973832eedae78b95fd4e3e1812debab366e8d5828a9f58339472dae8ae1502576365e675553e24f46515e626b2ee061d682cf12f154a68aa73c65ad2e2a13a SHA512 0765481c4f7c2d093c32d765c6f71cd3090304ab18d6265acc3b24e8b3b67e8eaf7c4dea02378d21bd2cf8904f7986e6aa52c5d76287a12503235f1407cbe4b5
-EBUILD qtgui-5.14.2.ebuild 3991 BLAKE2B 9e12b0b0f3b8b73031b56cf403da613d4a59f690f959828972d48fd61f698f061844769571b0a654875365ce4de5818747a1a2414fcb91d39338ba4c7949308d SHA512 8cf4e367499acaacbb59798b13d50382bc3c0c625903e8ca37c840f3f50a482a001d54f586a046c2a344f9290df64aaaa65d1e9a7909eb8729c164be613c8d6b
-MISC metadata.xml 1304 BLAKE2B a56dc3850426ef4395e27a093d2f0639444f01fe6595cdd7eadb17681cce17eba664c1df9907ca88e89060c3b37b8ae58d920c0149071de21b44789978c5e51b SHA512 c116aea83cf5d13d8e40d2d330106c07b71bce1e77dd4da10525df3dffdf67552780263ff7cb1eb109fed486648da7e1a6df0be2f07437e110809fd838e1dbc2
+EBUILD qtgui-5.14.2.ebuild 3989 BLAKE2B 6b34744d6bf5c923ad5a05ce5c71eda7c4d8b09e367133111fd14e144c3f769853d24b78aa05aec001947cbb83ca2270d7b88db54b4be159847905c124bd7c51 SHA512 63647c9267b8341d46398b8e08edb0be82fb7850c8d34716123e1a348d969c21404d0eb6044a8ac0af3feec07eacde4bd88a6e1204ff4098e79d6e244c1ccbfb
+MISC metadata.xml 1221 BLAKE2B ddd5982d379222008bfd11c2462de6570c2492635c16a57e7815a23c4870cb35713426fdd4645c7d8d3b32e74afb854e7c8a38ecb5b6c75661136469009fe62c SHA512 d8b994729f64acd05c6269038d41f290885f848b644033e7b8746b35652711a703c313f751e636f6e09e72c360fe107187072c3554e2f9efb1b398a8f7d48bf4
diff --git a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch b/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
deleted file mode 100644
index 6f63a6371ad7..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.13.2-no-xcb-no-xkbcommon.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2749833d844b20a9e642b2df2074dfafde8622d3 Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Wed, 6 Nov 2019 00:54:57 +0200
-Subject: [PATCH] Fix build with -xcb and -no-libinput
-
-Since a34e81ab [1], 'xkbcommon_support' is under
-'src/platformsupport/input', and will not be defined when building
-with -no-libinput, and as such, 'xkbcommon_support-private' added in
-'src/plugins/platforms/xcb/xcb_qpa_lib.pro' will be unknown.
-
-1. https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=a34e81ab
-
-Change-Id: I79563b329623651b462b8fedcfb59ef5f2c2e52a
-Gentoo-bug: https://bugs.gentoo.org/699110
-Suggested-by: Petr Zima <zima@matfyz.cz>
----
- src/platformsupport/platformsupport.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
-index 6d4f1b93bd1..877665ff06b 100644
---- a/src/platformsupport/platformsupport.pro
-+++ b/src/platformsupport/platformsupport.pro
-@@ -11,7 +11,7 @@ SUBDIRS = \
- qtConfig(freetype)|darwin|win32: \
-     SUBDIRS += fontdatabases
- 
--qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid) {
-+qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConfig(xkbcommon) {
-     SUBDIRS += input
-     input.depends += devicediscovery
- }
--- 
-2.16.3
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index f785d85e8c4a..b10c1ae50253 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -15,7 +15,6 @@
 		<flag name="tuio">Build plugin to receive touch events over the TUIO protocol</flag>
 		<flag name="vulkan">Enable support for Vulkan</flag>
 		<flag name="wayland">Provide <pkg>dev-qt/qtwayland</pkg> to ensure Qt applications can be run as Wayland clients</flag>
-		<flag name="xcb">Build the XCB platform plugin and enable X11 integration</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
diff --git a/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
deleted file mode 100644
index e296604eeff4..000000000000
--- a/dev-qt/qtgui/qtgui-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,179 +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"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-# TODO: linuxfb
-
-IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus
-	jpeg +libinput +png tslib tuio +udev vnc wayland +xcb"
-REQUIRED_USE="
-	|| ( eglfs xcb )
-	accessibility? ( dbus xcb )
-	eglfs? ( egl )
-	ibus? ( dbus )
-	libinput? ( udev )
-	xcb? ( gles2-only? ( egl ) )
-"
-
-RDEPEND="
-	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}
-	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 )
-	tuio? ( ~dev-qt/qtnetwork-${PV} )
-	udev? ( virtual/libudev:= )
-	vnc? ( ~dev-qt/qtnetwork-${PV} )
-	xcb? (
-		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:
-	xcb:xcb:
-	xcb:xcb-glx:
-	xcb:xcb-plugin:
-	xcb:xcb-render:
-	xcb:xcb-sm:
-	xcb:xcb-xlib:
-	xcb:xcb-xinput:
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	:gui
-)
-
-PATCHES+=(
-	"${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946
-	"${FILESDIR}/${P}-no-xcb-no-xkbcommon.patch" # bug 699110
-)
-
-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 xcb are enabled
-	use egl && QT5_GENTOO_CONFIG+=(xcb: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 xcb xcb system)
-		$(usex xcb '-xcb-xlib -xcb-xinput -xkb' '')
-	)
-	if use libinput || use xcb; then
-		myconf+=( -xkbcommon )
-	fi
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtgui/qtgui-5.14.2.ebuild b/dev-qt/qtgui/qtgui-5.14.2.ebuild
index c35dd63b66a5..46c80da5c92d 100644
--- a/dev-qt/qtgui/qtgui-5.14.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.14.2.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
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 0e4f5075a7f2..c3011b18ba49 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD qthelp-5.13.2.ebuild 569 BLAKE2B 9627fa7b84808e96ffae953c8d8e8aec6d4b9092f9321d0f9370b058133cf5fabf2d169e9af9341c18fb8d88ea840aeaeb81b8378db4688e5ed4818631ca84b3 SHA512 3abf0e512f3d5afe67d54ee313456f6fae148cbd4311977f48d73656622290aa09b595dc5bdcaf35c336010487c9374c7a37ef3cd5e186aafec8a5e51312d762
 EBUILD qthelp-5.14.1.ebuild 609 BLAKE2B 71b695cbd77d760df1b9bf26eb1bd390de4a82cff57a94bfd0a30c2b84d948087fca6efd6734a747483ecc0923d6fb05a1bb8a14a660f2def5965c5edd1fd216 SHA512 1b9a3bd00ecd30ec9d251b82cc72c6c20a1d7a1d4d6fd7bb5437a79e8307c4458a8d518dc837a3eef2d08ac81170058d02831d9c6a955f5c78e135f5cf0522c9
-EBUILD qthelp-5.14.2.ebuild 617 BLAKE2B 2ccc37e9d104c03319a35a8ed17ea05a66b1793ecaa64dcef00044f475c31518f65bb422ee2aa2d7428dbc1eefb0def31f18af7aacc6d42615fb7a5128970115 SHA512 84842b51058d20a57043a64bde92f69d38016670168bba14b8925b318a2f0087fa8d2799a24caed2fffe4c386a9cc8e53a4cfcc70e29fc8c4a1a58da8afef91d
+EBUILD qthelp-5.14.2.ebuild 615 BLAKE2B ed198188a99808391cc79af1365b0d68a6b663b66d9dbaa5ab545facc2c0e40403d28623a4e16f80ad0e723237f2e48e5fc856615fef5f8ae7a5300344e222a5 SHA512 4f586c89fad089061a197b9aaacd6da309bd75e6a811dad3559c7b34975872bcfefbfa046cec41b41e997efaf7994cd069a3619f3e5cc3711ac0a4bc08510f4a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qthelp/qthelp-5.13.2.ebuild b/dev-qt/qthelp/qthelp-5.13.2.ebuild
deleted file mode 100644
index e859fdce9a22..000000000000
--- a/dev-qt/qthelp/qthelp-5.13.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="arm"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~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.14.2.ebuild b/dev-qt/qthelp/qthelp-5.14.2.ebuild
index 1590efa1a496..ffc07f3b1a70 100644
--- a/dev-qt/qthelp/qthelp-5.14.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.14.2.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 1da11dba935e..5627e9fc1b3a 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,7 +1,5 @@
-DIST qtimageformats-everywhere-src-5.13.2.tar.xz 1803796 BLAKE2B 771b883f8b415a7eb7562beaacf28cc6acfd7ce7828e4bdb4c7fe12bc283bbdb79742e15152b0baf0fd8cb0d46bfe88577bace6b13162396f1211aaf79c0e727 SHA512 e76d7efaeab81c4eaf0f41dad150ae6b36ef2246993d344e4611ed865d62a8ac93cca5f62a2c94a97bf16333344490b5a51ca8de1c7eeb460c9ae321f759f4e6
 DIST qtimageformats-everywhere-src-5.14.1.tar.xz 1810072 BLAKE2B 4c5f30fbdf013bfc224401a53b93210b8c44fcff08c99660b606dca85f2dfcf872476d56bc3375dbb9e18154dcaa422542538f12978077811f4cdd400d4f8fdc SHA512 843c8288a79506d4f2ac9e318f9478d689045bd0de1c2d9a529b060bd44dc7823561baef290bc54ed6cc756027f1dcdb8f706a2bd122ec9aec18848e5d316555
 DIST qtimageformats-everywhere-src-5.14.2.tar.xz 1805208 BLAKE2B 115939d859478ccb2190c68ea3e93484537d372f62fc03f42931e69c5b7e0f1f84b376659986c3a36082e05930cafd076579c9786f9f4669ebecbb4254ee8d35 SHA512 e835489bdd1cf19aaa1c04e6ae1c480d4077cf24eee1d46b2f4deb03c093f64df6beaf83adb69b7edcba67c952a60deb89a26923addf2b4254aff18bc2ebf6a6
-EBUILD qtimageformats-5.13.2.ebuild 635 BLAKE2B e740ec57c19eaaa891d635817eb6334158814029cbe48bd41373d155ab21a1b8674115ff92d52ec07769139bc7c6b270208291518bd14c97ca1193d9b52baa11 SHA512 f9dd9ca51ef0be811ac36300718bac656f3aefc3448393e668969a76f2f84726d15ab820b30bde492cc36e3f5cf48174d1fd7b985d389a400fe496151724673e
 EBUILD qtimageformats-5.14.1.ebuild 670 BLAKE2B 7e0781d822eb83ae28239f7a9c5176f709cea7dc948addd0e05fa2e5e10799f7ef20e8f22683fbfcaaefeb21e7738fc237cdf438b871fc0a925bd36e3f5b4e60 SHA512 d75bcf577b4a7fefb28023ff2459cd7ca15939f948a420ada145aa723b9c2a78eecbfe3089a5808d949426985969e34ec5ee0e8eda0abc77a96b8844cb3f5ba2
-EBUILD qtimageformats-5.14.2.ebuild 674 BLAKE2B 2aed0c80dd3db32cc8604c02210c9f4776d7511ddcbd9269cfd0fa412c60f6edb46a9acda5755f4d3fb9d7d5d6de02bd96b4309495a6dddfaee4badab683b73f SHA512 b3f7aaccce0cee2810e008a4bd23065886e0226742b7fedaa303034dabb6e1660c8c7db8b4a986f193941cf8c4c20579d1473c28e2af2723ab65821ba9f5f0d6
+EBUILD qtimageformats-5.14.2.ebuild 673 BLAKE2B 68cac556c3eba1fc57ad2cf332436c72064dbc3b426cfec8ee5871f2cef6e7caae5a47c6aa6d1f98ede3d577839c3ab393d9f65fb2eb2bd451ccbda165247f55 SHA512 7e12a1c7e2914fa01cbe81c203ca442631ef5c86a67c0d0d5191e842464f1174043c5ebc70f37efea935e61802801288e3423bc6434ceb5f89a5c585d2f10613
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
deleted file mode 100644
index 5527a38493cf..000000000000
--- a/dev-qt/qtimageformats/qtimageformats-5.13.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="~arm"
-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.14.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
index 64b53f6914c5..d8d3bdbfbea1 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.14.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.14.2.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 c9cfb10de20f..e4aa1f038cae 100644
--- a/dev-qt/qtlocation/Manifest
+++ b/dev-qt/qtlocation/Manifest
@@ -1,7 +1,5 @@
-DIST qtlocation-everywhere-src-5.13.2.tar.xz 6050044 BLAKE2B 912810dea36652b96b0f93b4e69755f86b0f12b3659420b3771649f00afc4909387768832989e2a7808db90467502bb8eb8f23734d41636c4eefb48c4ea534b4 SHA512 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
 DIST qtlocation-everywhere-src-5.14.1.tar.xz 6119236 BLAKE2B 8ea66354f17e67d02c3e0a2a6369b55af006f6aa3f7d8b3c0c914df7d01db852a63d3e6a24f11516aea6667dbc9888a361fe9a030b903720f77456ffdaa96710 SHA512 5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8
 DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
-EBUILD qtlocation-5.13.2.ebuild 956 BLAKE2B 53ae5634589994c34caa57632bb35c042e6e14cc5f49cc13091f93410cdf0e290a4e596c24494049dd6a47c11aaf9bcc1187d012508710f018f433b2d20cab62 SHA512 dacf644d78b338c399521fbe0429bcd3cff26cdfe05f5c89e8429a864889ec221c38d2830744f87a0296f3d70deba66e4aff5aa1262cbff10f77d449d923492b
 EBUILD qtlocation-5.14.1.ebuild 973 BLAKE2B f301061d398d1a0670544c41babb551c02a738ce60ecbbafcc039092ec6bb2696dd02348c70d9444ea251e0d31e6567f701dccb3bab478bbcfa8e924717fa1e5 SHA512 768f565dda4866f4f6f7d700dc85b7d136a2720688416360362447f61937faf420afa92edbfc99f368ab06ef588fab20448bc4545400dad83076fa03da23ac7c
-EBUILD qtlocation-5.14.2.ebuild 1084 BLAKE2B 30812ce7ba958e733b0227da567b553939e703309bdba38704fb3517142ad39560f4ee9c2ddf0db01b80024dbbb10b1bdcfd78fbc8b3f3975853ae289e7b7e45 SHA512 c99e06cb810af75332d5cb70294504304d76937655b95bc6f8f9fc09608d59b0376f60f9cb315cc93b2cc722d47bf2a9b731890e2ab0c830ba64c65e3b5e7d2e
+EBUILD qtlocation-5.14.2.ebuild 1083 BLAKE2B 7366e3d73b577380d6fc2fbacf821bb3e33bbf7698acd4e403a02d3d55fd7aa286ed0974105e0077c59e1802225d6c224d0022f38c6a6d8c1d85d80e299e39cc SHA512 3898fb0fc06316d76a02f4fe31ca0f086cf09e07b1a2239f3ff7b1ed681186ad59af679713eeb6f3a630b1bad65ff843b02bda61c5f9a0c3ae2b8dd2f47c7853
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
deleted file mode 100644
index a373712510ce..000000000000
--- a/dev-qt/qtlocation/qtlocation-5.13.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="Location (places, maps, navigation) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~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
-)
-
-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}" || die
-	qt5_qmake "${QT_BUILD_DIR}"
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild b/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
index 07669c361d64..d7e1e290a78a 100644
--- a/dev-qt/qtlocation/qtlocation-5.14.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.14.2.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 b281f04b07e6..4a4bf8daf94f 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,8 +1,5 @@
-AUX qtmultimedia-5.13.2-gstreamer-crash.patch 1395 BLAKE2B d53993a824ee9bcf43d23c2d0a5755ede01d232bd71a0f578cb242147de3b3835e0670ad982c4e3ff3109d53c452517770948b6ca11f3656180d1659aeb2b831 SHA512 5cc9b7986648420bcbce372286f93637e772ea55d25d953569b61eae18e6e678f2c1a0fca00e96528cbe00543872151a3e07abc02850b96df6ad297284317958
-DIST qtmultimedia-everywhere-src-5.13.2.tar.xz 3820660 BLAKE2B 19949b1256ceeec38a10210a7430082ed197c1f19d37048170fa55a56554e741e3af670733e25fbccf11426d08075f1ac40589a2106169fa0ae9838c8b7725ab SHA512 a18a2dc56ad33068efb78e5fb61df3c45d0102d153a02122ce39917df41acb161469092d0299df228fa7afde53260e9b7acf82ae016b99618c94d2caf02efa51
 DIST qtmultimedia-everywhere-src-5.14.1.tar.xz 3795732 BLAKE2B 2022d204c0e0632865f4dc3431bad0df368552bca084d57ca79c446bc562fbffdbd05087db6160918eec9964d85670f194ee52408d700d2a039a672cd6d4e841 SHA512 5e82d1d6078291d2b4355e03c0a50311847a76065d931039a50c995d18b0a658ed67fd35df78dbb49d7a231745cfdd4fbe7d23f5b652e6bb0737060a9dee5ce3
 DIST qtmultimedia-everywhere-src-5.14.2.tar.xz 3793964 BLAKE2B 98f408e9a3ea48c053797ec20139d134a50d623a4092665695a435c754ee85a369830b23cc5ccce3d9a099cf707c1b28c2529050ff60d3f93f26809b3b2593c4 SHA512 5ebee0f96334d58b74ae344875aa93d32bfdd7c906856f84152e9ae0a3ebb12f627a0d3ab4552031b70c20ad59db1674b1a261ed0828e1efcc6ab48ba3718559
-EBUILD qtmultimedia-5.13.2-r2.ebuild 1491 BLAKE2B dc9e2c5bc6df45278ee1179d5ab57b2cae17297388f31e6e1a4e1b7a1d4126990bee31c6d7327c97c7ababa97a78f6732b059d3f5cafe5a4efe85b5bfeb46c32 SHA512 f3e19bcfb74d750aaa97db0453508ebbe05f5d6cd3c1df9dda3d7cfd92716efe962a30766f4324e0a41ad2eaa88e8feb607ec909593fe516feadf85daae8cb64
 EBUILD qtmultimedia-5.14.1-r1.ebuild 1463 BLAKE2B e1a9cc0ac94ea56a784de8614d08bd14abec07d0d5086f6d0261bab4cd9efa97215a8d5a5970243fd4ee4d8fe8709038309afe2e745849225608eb14e1fa8dbf SHA512 3b96b93dbe94b5dca6186ae7e7c1b722f034fbe20adc6aba8af225e310bdf16088d2d785f6514cbfdbeba0a9af5ebae10216ac430b7b6455e0c27a7d40150c20
-EBUILD qtmultimedia-5.14.2.ebuild 1468 BLAKE2B c0b9361755a7a2c37196ff417c2875c498a61e3e5a3c775a06cebbac9948242a960802bfb3b97cd21ae564763e71562563b550bf69151bcbfcb4d7e09e9cc1ec SHA512 f152a6f0fdec63bd1f699e15a79802d3a2b347e2dba7362a4d56dc8f0c22c70fecc30ee5d68ff1421226c04810496c1456dd39a2a66d5f781443d1927ea8b47a
+EBUILD qtmultimedia-5.14.2.ebuild 1466 BLAKE2B 4fecd64481969699b4377b83005a2b4f5be4c44c65d8f2bc2275e0b95a97c0ae391ffc554d159c3a8f87dfbf4ae177c3cc837978eda1bcf34c29917f90de274f SHA512 a8bf1af802ee94226ace78479e32ec6b8ae391cf4a3914bd3796480cdfcee809f74b35ea9d61b00dd1be9d80303ca09bc455ad174de923044efd212dd489692d
 MISC metadata.xml 732 BLAKE2B f07c73041fca311cdae68d67a638926bcc124a879cb39d92a431c42c2eb5fdec65a483a24d4931534ecd0299a655c584fccd5d42d8694902a64e0da6d64c627e SHA512 bf4f77d5e918dccac25a31bba310f8a508efa0f0ccbe5c142b48443205f44e50477a46d7c363ba9313c623ff68d5a9bdf1dc699aa6ec3fbb3ab6b14afd1eff55
diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch b/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch
deleted file mode 100644
index ffcdc89c1d3a..000000000000
--- a/dev-qt/qtmultimedia/files/qtmultimedia-5.13.2-gstreamer-crash.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4d251f072c6f97b4cf4618103e4e857e499c5ed7 Mon Sep 17 00:00:00 2001
-From: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-Date: Tue, 5 Nov 2019 13:39:55 +0100
-Subject: [PATCH] GStreamer: Fix crash when video sink is used when it has been
- destroyed
-
-When custom pipeline is requested, all playbin related elements must be cleared.
-
-Also when QMediaPlayer is destroying, it disables showing preroll frames,
-property of the video sink, which was already destroyed.
-
-Destroying of m_videoOutputBin decreases refcounter for m_videoSink,
-since the video sink is owned by m_videoOutputBin.
-
-Fixes: QTBUG-79753
-Change-Id: I2fcbd19372caf46adf2ae1ed2e5a7d0ee70040ad
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
----
- src/gsttools/qgstreamerplayersession.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gsttools/qgstreamerplayersession.cpp b/src/gsttools/qgstreamerplayersession.cpp
-index c0998d7ae..05e419b10 100644
---- a/src/gsttools/qgstreamerplayersession.cpp
-+++ b/src/gsttools/qgstreamerplayersession.cpp
-@@ -252,8 +252,11 @@ void QGstreamerPlayerSession::resetElements()
-     resetGstObject(m_nullVideoSink);
-     resetGstObject(m_videoOutputBin);
- 
-+    m_audioSink = nullptr;
-     m_volumeElement = nullptr;
-     m_videoIdentity = nullptr;
-+    m_pendingVideoSink = nullptr;
-+    m_videoSink = nullptr;
- }
- 
- GstElement *QGstreamerPlayerSession::playbin() const
--- 
-2.16.3
-
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild
deleted file mode 100644
index 6946c997e652..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r2.ebuild
+++ /dev/null
@@ -1,70 +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="arm"
-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-crash.patch" ) # QTBUG-79753
-
-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.14.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
index f8b9dfe3d426..13f1b39dbc18 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.14.2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.14.2.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 064bcda4d0a5..9ce9cd902449 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtnetwork-5.13.2.ebuild 1266 BLAKE2B f1ad876153e22e47accb681ab8158a209335676926a6b5c278e3c874616a0fc3086d6fb77f54b1793c5d571ee1aa5306adb0f706a484737762f5601f27d93010 SHA512 bc57eadf4f994deb95e68c3913c9b597764a3c8df4bf756e477f38a9288fb452c7aa6ca061980dcaf580f5ba0ed557bf6b2711405c6e6329302fc06e7f29da00
 EBUILD qtnetwork-5.14.1.ebuild 1306 BLAKE2B d37589fa1ae053eb05d8371563636c06b873119b9b0bb3f186371424cdfb49420a9e1f3b32b0d329307e61b2c91ef531c4d821f914c46009689035fadb2b6c16 SHA512 dd4855a70afa1f21ef95f98f9d8a038d115d2ff106e9b6a136c0a225457e47889116473e3dfe3f26b91ae05c6a0d64d28b68d08d224710948545297a1a66a6bf
-EBUILD qtnetwork-5.14.2.ebuild 1399 BLAKE2B e5c751524fb363914b7e31713cf3e9bd0edea518bf3e0373aee70d23e923258041441bb4aab33a5205f68178177fa747c07b4b6bae8e1e3c4fa7c557d71d5172 SHA512 ff0cf8090d491daa09d7c12376f92dba0bd2aededf4c7aa312aade4e95993773cf802d4f6bceeb72241a33fabe29bd7a9c2fe81d5d06110c67e1146eabbf64db
+EBUILD qtnetwork-5.14.2.ebuild 1397 BLAKE2B a8cbc27b5661382942636bbeba77a83bdf934b4195911cab6f058f72a467bd45d81f26cc654be3ce812e04dcc0297c18fd7399a1995ec20b635022ad9c603ef5 SHA512 f96650d17749081581fd27a104bac82c14ef22597a806bf66e3b596392b3c8e9aeb25b2aa01297b2f52da81811eece2e059ab4d8ac1692a61b5bfc04971f175e
 MISC metadata.xml 957 BLAKE2B 5c888322d402a3f037e194bd13001ff3a7e449fe423b8b4661c4b1365263a63e105be92ab0bd6a99ae79e7e8062c65e52e9e04763f9c15c50cb28c1215a06b0d SHA512 aa07869c984c4c2d7653820213b94fa4db247e4e30f0efad8df64c09b2578cd2143ab81890584521e1f561953312abb36d8e049dabd42893fecefea4182f176a
diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
deleted file mode 100644
index 4b97e02f2233..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
+++ /dev/null
@@ -1,60 +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="arm"
-fi
-
-IUSE="bindist connman libproxy networkmanager sctp +ssl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	sys-libs/zlib:=
-	connman? ( ~dev-qt/qtdbus-${PV} )
-	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
-)
-
-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 '')
-		$(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.14.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
index 1e8c4106e03a..4d10e16d3906 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.14.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 arm ~arm64 ~hppa ~ppc ppc64 ~sparc ~x86"
 fi
 
 IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 58180de55e61..755fcff0798e 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtopengl-5.13.2-r1.ebuild 615 BLAKE2B 0353e36dbf87fbcc524e9748dad1f610018a8ce2b0bfdab6ae3e18fdec30847238c0d7c6c1a2689abfcf4765e6d52ee799b4779edb12ea47837b47866e79badd SHA512 bc1f2e24b40fc3f6562100fa8b9fd4de53e97876a9c6b055338112fa7c3f75255e94c237c3ce1ac6da1913c9003e6e1d6ff5b9d606fb67bc049438e512bce9dd
 EBUILD qtopengl-5.14.1-r1.ebuild 655 BLAKE2B c6484e88455f763fb3582c36f3ab470f6935173a8cfccb278f5647709a8443252bc72cfe4f192570d6a9548476b37e339fd28f003be034cfe1ff68fff6935ff6 SHA512 fa781c852509a89ae0d02c475c2b75011fd7cd0e625294339e40c0f721296bf553c77102b3fad73bbf3f9bb3cfffb2e2ca0013598a9fae88f695bb4c7ee60fd0
-EBUILD qtopengl-5.14.2.ebuild 663 BLAKE2B b5ed7e2936e449ab115aed7f1fa1199661d176d5985040bf1dad4f3e83458d62a9ac1afbea081f9b68fe3799e07ccec8379b63dda8843f0337ff136d0f0ee40c SHA512 150da15223ec6f4049d9c05b7facb12faec803d22755d5f30f89366f3b5af8eb1ff1a76583aad17556469ea4841a0208df4506392febc42d6f383e92fdd122de
+EBUILD qtopengl-5.14.2.ebuild 661 BLAKE2B f0f39a637d9fa1d0c849d6bf0c71cf3d4ba4f6a37604ce00baa64f4a4c0f562d228ba857bd8af3ab3808da6f5922bbfce5dfd05a42ad8c657dbac56515356a7c SHA512 8ff6653734b17c272221340973de1aa4993728a2cf0e7733d5bc2f92cdd56ffdf791e2906700243f662f33dc6a2693d4cf3ce5cfc1d977a3e77b0dc0b5b56c4a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtopengl/qtopengl-5.13.2-r1.ebuild b/dev-qt/qtopengl/qtopengl-5.13.2-r1.ebuild
deleted file mode 100644
index c772d0bd7ced..000000000000
--- a/dev-qt/qtopengl/qtopengl-5.13.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="arm"
-fi
-
-IUSE="gles2-only"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~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.14.2.ebuild b/dev-qt/qtopengl/qtopengl-5.14.2.ebuild
index a2891c533fb6..4ffaa4034734 100644
--- a/dev-qt/qtopengl/qtopengl-5.14.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.14.2.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 a256bde5276e..d723aee5dae7 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,7 +1,5 @@
-DIST qttools-everywhere-src-5.13.2.tar.xz 9110256 BLAKE2B 4651c350d5bb9200dc6c4b362b8d69abd108f63fde74f6b3382317c8b0f4447cd56f6a463617f50c0901155457ddd693dcf2bc75cde9cbb1565e693b36469bec SHA512 46e76d81c1b16160c9ab8da1475cfeed28e7140bc94868d4fc834639cc15ec67199b6169a7c820107cb72982bc2d56ba6987225f3fc773b8464e4023fda74265
 DIST qttools-everywhere-src-5.14.1.tar.xz 8810972 BLAKE2B 324246728e814eeb5d297fe72cfdc8af584c555f4676f8f6325c9f2353140dc04c98b3f1e1d39ffacecd43527e13df1ce1b1608377794eb8247d3f2549d6697b SHA512 59874ed00f7f9749f0dda49d6e1ad064d1594c6b0bde577961c5d45628763d2a2031aa7ebed952f1cebc8a241eb6a0e4a4f8e36c0a93ffe738a0ff360b8d3f30
 DIST qttools-everywhere-src-5.14.2.tar.xz 8815020 BLAKE2B 2535541b53cec5cc2dce1ac06ad70b145fce38642d8142f43a800a630aa2f69ad255e8f0a38c44022d14cc5b4373603026cc7c149c2435621f91a66ea0bf223d SHA512 e5b56d38acaa59511f24c817999f901510397d6e8baccc06a8fb8375f09b71dcffda4c57def4eb88d6c2782926d612b382957175a087a0c2224245051c54fe7e
-EBUILD qtpaths-5.13.2.ebuild 369 BLAKE2B 6b5a95839f70e24eb6721e85d0b77b55df119e6d2358c347efd3ad6f38c4308c8d9103465253a0feb898ab54cb0ca0cccb3b9bec9c99f1a5b087f861b42c2d5f SHA512 e293621bf9bb89ab76af86c8ec1d1921575d894e38c5dd823d757c48dd8bd3fc83541e17f7b3b2cec2231eb1a99eaf6abf7bd8fcfc6b4e220f8831abc5af54b4
 EBUILD qtpaths-5.14.1.ebuild 408 BLAKE2B 0ec3c625d045bc5d9386889a1370c7c5a05f68eb2b8953d66e07c92889d5c16e72846b990b76cead4610b0183b7b99f384465cc61def057fdafd86c23ceed70d SHA512 aee2f4a9e91fc2d95a67aab93d2fc2cec44b61edaffe988dd8a8b728d64d50ce769719e728e00705198a2d73d9903e9446cdd963002a5585b3efd5032bef5291
-EBUILD qtpaths-5.14.2.ebuild 413 BLAKE2B a35b29332a4a1b5a1579206f3961ffac542eb70aaa06ff75c885ac64e823f525f93b39b544674a95ab96953a96bba2de1c12fd8ab8866dd1561410852bd5a844 SHA512 2100a43804de909c65d926ea2f54288944bccd49523c57d7ded9099dc1f5c50cce6b86c56e9afc51023bd8a080c240f2c0a5fb608d117c9f2271c70e8980bf03
+EBUILD qtpaths-5.14.2.ebuild 412 BLAKE2B 03c799cc8ce07ac4d54d63dc716555e460df236ce4f13ac4fc395952e8372459836f0ac9a5cafc9374226be26e80c61054c665ab2a4d4cc8447f1acfa75ca241 SHA512 03d233680862713e2d4d1b69d8a10e1d0c0f5e1b5978564a42a54e455567ea250650a9231951bd1cbc5e12ea651d1a739528e2181cc080b7f207f0d1f84f7945
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtpaths/qtpaths-5.13.2.ebuild b/dev-qt/qtpaths/qtpaths-5.13.2.ebuild
deleted file mode 100644
index ee1ce79389ed..000000000000
--- a/dev-qt/qtpaths/qtpaths-5.13.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="~arm"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtpaths
-)
diff --git a/dev-qt/qtpaths/qtpaths-5.14.2.ebuild b/dev-qt/qtpaths/qtpaths-5.14.2.ebuild
index 7e77477f537d..ba81df72cda6 100644
--- a/dev-qt/qtpaths/qtpaths-5.14.2.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.14.2.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/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index afab9cb802df..7fd680d72a6b 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,7 +1,5 @@
-DIST qtlocation-everywhere-src-5.13.2.tar.xz 6050044 BLAKE2B 912810dea36652b96b0f93b4e69755f86b0f12b3659420b3771649f00afc4909387768832989e2a7808db90467502bb8eb8f23734d41636c4eefb48c4ea534b4 SHA512 6ec28fd3add9db5758d38b964649c6e1e687e853192539c4e46386eac28378540167ec0abbf6312ecc1d2f3d33d19eaed4c4485f0c2d94a93f401dde3b9ddf6f
 DIST qtlocation-everywhere-src-5.14.1.tar.xz 6119236 BLAKE2B 8ea66354f17e67d02c3e0a2a6369b55af006f6aa3f7d8b3c0c914df7d01db852a63d3e6a24f11516aea6667dbc9888a361fe9a030b903720f77456ffdaa96710 SHA512 5ccba22c27beb0bbde4b84e510e322445d98f99d87046d463bd054d0a09f0b24af978cf372006aa2cfca0a0ca0fcbb067525a6dc103d2d89592afec0600efcd8
 DIST qtlocation-everywhere-src-5.14.2.tar.xz 6120852 BLAKE2B 0224cd6eecc182ddb960c6f3814d2d913a2776e879bb2e87a6c11f18840e275a770977df89c6bfa1aeb174502713969b5d8c02f9c46670671034f6879a41150f SHA512 ca11e118a9061f69ac0181db14b1bf92309c03615802092f7cf404c882108efa3acae9bb73ee3870ea68cd7d7d11863445fc72dcf52099d6be77e0986b7f012c
-EBUILD qtpositioning-5.13.2.ebuild 808 BLAKE2B 66ee8fff52d7461176679e37b276d985ba96755bf46d43de0029ecd00c977bc1e2f4d509b89f72f42e11db02216cfad02ea49e86f5ee8ef413d50c250121d527 SHA512 eef30456efa2ca96147e6dcb54385b540e2d44a1a910b40ba5793afa1f1af8c563b4bc57b44195184de1c040f0001eba40dde0955fb3c69595729e6c6f20b548
 EBUILD qtpositioning-5.14.1.ebuild 848 BLAKE2B a0ba1aa4e8514dee1fcb277aace29e1bc2b7b05bf77c5eed295b055841f634ed35013dd68a941e7b19467151222b5821a40981f158aae9c14cd22eeaa487a0e5 SHA512 78438e834906f1b53bb82947c62fdc963bb02f638300d4f3091194729cc885fbe597d550a2940cb1dc2c2b9b8d4620c48ff1668209bc4315ace46543c242f1ce
-EBUILD qtpositioning-5.14.2.ebuild 853 BLAKE2B d89c06e274722250787fc29a1bf8106cd84b18015872482efc8b00439a02cf45ca5d612d167b9f21e934ea971eb7a44ce541e12794d4bbae4acf42cc58239ab4 SHA512 629a2deda3ab8b945e72062d4f9b5de8f24881ab0f401a429b34358243a43828b72e0ba46d4d1b691f85b3e5f8e3b69053e22afce9544ec862566914b049d766
+EBUILD qtpositioning-5.14.2.ebuild 851 BLAKE2B aae762c52d936cabac03b3bd59fd94b6ff9dbb9fc578fb7bdd3ef1c83a7af8f1d46b97411e0e42abd984060afb8538ed1ea6736e2dc6d18386d350e65e5f7798 SHA512 c96e22988e78d46a883e67e4490e59b1cff2e44ffe79a1e6787cb5a8cbc3444e0ef5237a4f0e45972cb79acddfd04840443793f3e69f138b66d178d44635da73
 MISC metadata.xml 638 BLAKE2B 7470ff8ea5653092c2c7967e7a1b393a4f75c60ae13de4837f47f3a2ac99e975c3b5dfc7ad3b93da2a9cb690737e3c51846146d4c39f830b528099e6c17b0694 SHA512 22a8957aa1e8cf06f20d163dec127c424d0b206bd2f1a4ddbcb3cd59d00cfacbb74c9a95a1f20a755bbe067c1f3c87f1e56cb5afc076c6c94de4364dec1a6cc5
diff --git a/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild
deleted file mode 100644
index 794f37d118ea..000000000000
--- a/dev-qt/qtpositioning/qtpositioning-5.13.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="arm"
-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.14.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
index 0db24b237f92..b6fad4a01fd2 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.14.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.14.2.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 0692df6422ca..34deb6d833b0 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,8 +1,5 @@
-AUX qtprintsupport-5.13.2-no-cups.patch 2196 BLAKE2B c84c6db10bc05a349d910c3c74519b33a9e00cc616def388a2f77f62099215368a6d1715f8997ef9d9231e594c05122ec8c5ca5db0b59caff4c6d0946d01f8bd SHA512 7fb16775627a484c4c9c6cc184f3c73d898c6f3600fb5769623f311f504dc8723713815acb99be6d11026ae3a067a7587a94b282bed95e8747e47798a7efb977
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtprintsupport-5.13.2-r2.ebuild 813 BLAKE2B 5e5572dbb950afece428f4d162431b4261fe4af59428c76e2d76252b07b386f760a9f59f8fbd22ee9b406f2731305cb6c8ab61cbc40223a260366cc9d43151c9 SHA512 86f0ec867d14ec8cba1b4a59d221182b62aea7e31264b84f58f76945c6fd2d1caf55c039f58c37d26b8ed5fc25df4659690b52bf224968b3eb61af1ed993a47d
 EBUILD qtprintsupport-5.14.1-r1.ebuild 780 BLAKE2B e7006172f947edfaa16620d4ec3b8f5d30f5b6eed00a765f41511e5bccd25a64ade0afb597269562a7ab66d3e7f0c64d09d387c544446f6754e3038e2e39751a SHA512 563a5bc47c4c329876758bb10772e6998acdf81510c7cc7cd9a6a6963d83c5a02bbf3036910bfa967b1d08eb2b89a799f9139033de0d4b37180e44611759b88d
-EBUILD qtprintsupport-5.14.2.ebuild 788 BLAKE2B d706d8e3afc1d8cb1d7b9c9af2320fcf5a6040fb7e53a268374c966274b9b10d6a4b66e44ebda267a5ab23c80566f8d690ed2fe97c9d4e829431b9e89839d3f6 SHA512 d42803cf2bc3d45c94bf454001fcb4a155121a230072e494acf03efaf85b3c35993fb20106ff966ad09026e8240a1371ea7e2616e7a63679b441d678341f079e
+EBUILD qtprintsupport-5.14.2.ebuild 786 BLAKE2B 423c54f33854f94565b8a4aa46afcf0c4674e971f496e22b34dae01e8db5c2286478a25e949365325ad2067a90fc9ac2013e81ca8193a59b94c6d1815fb94732 SHA512 b917d22021ed79ab810030a216f6731073bb40a865cf7abc58f1b64d97561a2820a08986e7ad52201c0483d832d36953be85666d7167e93fcdd4930137257ebd
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch b/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch
deleted file mode 100644
index fe19baf4096b..000000000000
--- a/dev-qt/qtprintsupport/files/qtprintsupport-5.13.2-no-cups.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2ad3348031d8a622374920eac5bdd8fb9ecefcd7 Mon Sep 17 00:00:00 2001
-From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
-Date: Sat, 21 Dec 2019 19:57:45 +0100
-Subject: QPrintDialog: don't access dangling pointer when cups is disabled
-
-When no cups support is available, ui.pagesRadioButton is destroyed in
-QPrintDialogPrivate::init() but was accessed later on. Fix it by moving
-the cups check one line above.
-
-Fixes: QTBUG-80945
-Change-Id: Ieb062b39e1461f39665ef612dfea1d7757274b7e
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
----
- src/printsupport/dialogs/qprintdialog_unix.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
-index c7328d9732..7bbf137977 100644
---- a/src/printsupport/dialogs/qprintdialog_unix.cpp
-+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
-@@ -637,8 +637,10 @@ void QPrintDialogPrivate::init()
-     options.pageSetCombo->addItem(tr("Odd Pages"), QVariant::fromValue(QCUPSSupport::OddPages));
-     options.pageSetCombo->addItem(tr("Even Pages"), QVariant::fromValue(QCUPSSupport::EvenPages));
- #else
--    for (int i = options.pagesLayout->count() - 1; i >= 0; --i)
--        delete options.pagesLayout->itemAt(i)->widget();
-+    delete options.pagesRadioButton;
-+    delete options.pagesLineEdit;
-+    options.pagesRadioButton = nullptr;
-+    options.pagesLineEdit = nullptr;
- #endif
- 
-     top->d->setOptionsPane(this);
-@@ -727,12 +729,12 @@ void QPrintDialogPrivate::selectPrinter(const QPrinter::OutputFormat outputForma
-         else
-             options.pageSetCombo->setEnabled(true);
- 
-+#if QT_CONFIG(cups)
-         // Disable complex page ranges widget when printing to pdf
-         // It doesn't work since it relies on cups to do the heavy lifting and cups
-         // is not used when printing to PDF
-         options.pagesRadioButton->setEnabled(outputFormat != QPrinter::PdfFormat);
- 
--#if QT_CONFIG(cups)
-         // Disable color options on main dialog if not printing to file, it will be handled by CUPS advanced dialog
-         options.colorMode->setVisible(outputFormat == QPrinter::PdfFormat);
- #endif
--- 
-cgit v1.2.1
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild
deleted file mode 100644
index 5c0100d98132..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r2.ebuild
+++ /dev/null
@@ -1,44 +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="arm"
-fi
-
-IUSE="cups gles2-only"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~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
-)
-
-PATCHES=( "${FILESDIR}/${P}-no-cups.patch" ) # bug #704936, QTBUG-80945
-
-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.14.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
index 5945c013cb24..fb25ec4726d4 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.14.2.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.14.2.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 805c73f011ff..2aa4b2bbd057 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,7 +1,5 @@
-DIST qtquickcontrols-everywhere-src-5.13.2.tar.xz 5955448 BLAKE2B 9094208aebb517dd39c880a608eb7d426aef58ea5cdae4b45d5ce99b9ec1ade4d138e4f13b778daec14f097b6680c906d9166b0f30e1e9ac77087776bc30fbc5 SHA512 5ec713036fc34c62cfe31eb83172c4922b2ef5584d23239776b2696129d23f61f3984e6a1a7f95ba15ed6b630b62cd1ea66af3d187c1682b8575dd331b764ed0
 DIST qtquickcontrols-everywhere-src-5.14.1.tar.xz 5982788 BLAKE2B c4faeabb3704f43daf2e9387b98a65dee50eabf63f8ce992a7fa158a01e73bf2f5fef6e03740c29f470603fb7cb86a5c7ca48ab3b053f5a905dfad10913f0a7a SHA512 63157debfdab05f8fe141964c5a7d61373a422a7f46c01d1e5a7123998700790c63c8a5f1489c6fb25fd89c3065e1982605180568cf6a69835feeda441582be4
 DIST qtquickcontrols-everywhere-src-5.14.2.tar.xz 5981560 BLAKE2B 91ac3b77d0f1e83a489148aae8b143d2f1131020084c22dc0a2ad9aecbff16bd19ea5a3f09eaba3146e5034b6914a696d6eacd0307ec8ca7c260318c49772564 SHA512 e5076d838e54e8fcc62ffd76d66ab322f1927f6489c51dd0fa6e39de1e003c1994d24730da79c8d9d2747839faaa7b1b78f14b58f05447db440a477094be40e4
-EBUILD qtquickcontrols-5.13.2.ebuild 705 BLAKE2B e1264092acfb5628bdac1f3c90b84499f585bf0c4cbf7a108384ca919e1f7677de981981ebbfb19e05400c3c89c751ba89995978eaf95c99075456c1323e16e2 SHA512 c5b68dbda70fbc8be34c839904c881c9b8ff275bc4bf733bd9ff95dbe623154e562bcaf3c7e558fcf7ec718abda46d899b80cf7407b49c5021f2951e7df03667
 EBUILD qtquickcontrols-5.14.1.ebuild 737 BLAKE2B 0a94889ceea8601da415b2c3327e299669e199b9d1fa02f9ddbac0b7aaea0ebab22a39251f623ad7d7981c23bdd9507abb0c578b4781a866f9a401fef5a3bf03 SHA512 0e93c4e36c6227a4bf30676f8fba75d181f9ebbb7ac0dba90bfe0ee9931db1b1cb5231b6734bacc31ef13b3a8c848a59178df3a3c4b32a315b2b61555cedc688
-EBUILD qtquickcontrols-5.14.2.ebuild 742 BLAKE2B bdb7ed3afb9cee48ff6ade378810f953b6ea60d3bb9704efbeffc13fdc48d5bd49fb7029ab21117ca13f56c03d191d3c642fbc92e893a7a2451050953a982974 SHA512 78ee6efb4d458c0361f98bbd6269be84107fa488b43d8fa77f5c54d0543f2ed9d738e6aba3a2219c3b25387fa482c988167f0a27d0ebd35663a74cf1b0a9025f
+EBUILD qtquickcontrols-5.14.2.ebuild 741 BLAKE2B 0ba3fd269ec921acc8e33374a6931d3feef7656532f32f2e41cfb809fae59ba2082eea0f6add2e9559f0df32af56ab1b3875abb93d8fb27d6d2726d8f7935413 SHA512 6e831ba5c7cc50b16845c995af2e0a2fc0df8a27050d510e7f6c6540c5a44d932b24c7a641458fe8c9d11c20d6b2b785db3c5a363779ab7d51e49c4b4371d723
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild
deleted file mode 100644
index 8b042de79a56..000000000000
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.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="~arm"
-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.14.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild
index c2df28c1c253..dac9b3c73522 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.14.2.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 d7211e1d899d..adc65ecb60ea 100644
--- a/dev-qt/qtquickcontrols2/Manifest
+++ b/dev-qt/qtquickcontrols2/Manifest
@@ -1,7 +1,5 @@
-DIST qtquickcontrols2-everywhere-src-5.13.2.tar.xz 9252912 BLAKE2B 8b5068f53fab7ba26bc7fa6aaf40d13581eaa35cebc55c9def9c7ddf51837f803a169e70dcb62405994c4e9704fb6b02a8bd56a59942c48996a4fbf6a974128f SHA512 f89b5126f0e6b96ccd206cef1229624949cb22f5f925b165af9a3c0ecb6517a0fd29f5c3958fd8ca008f1b000ffb352833ee90ba0ce0fc5f7983636732440a0f
 DIST qtquickcontrols2-everywhere-src-5.14.1.tar.xz 8151808 BLAKE2B 79a9dfc75c3e50f08237377961801eb9971e5489a39d83387340a803d8f6c3956118129cfd26028707ba80b3b7bdc338b7292b6623f2404e30206ddfe3dbd852 SHA512 c35a450e26f9afb79c237133d407442823fb6bb664c0d2c952b92f9084db85f0e7ba02bac9aca3aef45670fed7da34c7ef183297360cb13aee4260513b4393ee
 DIST qtquickcontrols2-everywhere-src-5.14.2.tar.xz 8153752 BLAKE2B d1803007fb016276b75db9102ebfd82a6afa279b845d3507a04b76c2ab6fc8345840f3ea76c12607ed2b7be11e2b2c26bb76ff84b65a4c8df7cf9c66dbd95003 SHA512 de8b669417c2d039c0f49e805be72e757877991bc3c7feb13417202a4964cb6391924837751c520ed6234930e90dfe00417ca1c369418b2cdf4f09da679ba722
-EBUILD qtquickcontrols2-5.13.2.ebuild 583 BLAKE2B ebe7ae09463b1be7c72dd15ca788959ec24dfd6523b9dda0899166f7a923281fd3c4a679a03ef54df45d9c41b99618694cb0f4b0db6290ab66ee50c748a2e98f SHA512 296a9a2617933c7e7a3337e4ce42ed96a9465bed82a66bf2cb90e9471b5fd6e52ae93468c36f0b2ae54bb77df976d976e08318a2ada28fea2aa3f84c38cce01b
 EBUILD qtquickcontrols2-5.14.1.ebuild 606 BLAKE2B 0d3d0105694c0a2be2ea02a6a4605dc3174de9535b4997f35a7dce5bb73ec782767e871e95ab1ff16103bc214eb9753b01085d1919827ad64d31b8cb6381f8bc SHA512 37a4182eb357133277b9e40af464ddf2d8cb0fd2a4990de23e986f5e764249e61a09674493042b13da62be44097fb3d717495161d771a99500241cd1db00fe0e
 EBUILD qtquickcontrols2-5.14.2.ebuild 609 BLAKE2B 1406936acf30b318039b6616e2e91f0fce406aa4ac70566c4ace70105ab71325b436af86f8c9144adf2e928fa9257d47a6e2913c5f903ed53b48135d9593d7f3 SHA512 3e005ce1c3ffcf1090cea4d536bcd00328cb657cdefc9bb311bbf14fe072d7533b05b8cd41c66f0661feec85482883a01d3e52eb97da202e6513b6002448da93
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild
deleted file mode 100644
index 6bb3adff4bc0..000000000000
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.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="Set of next generation Qt Quick controls for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm"
-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}
-"
-
-src_prepare() {
-	qt_use_disable_mod widgets widgets \
-		src/imports/platform/platform.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index d30a71beb8b3..d7b3dee87270 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -1,7 +1,5 @@
-DIST qtscript-everywhere-src-5.13.2.tar.xz 2696452 BLAKE2B 6d13901412eb8680e8c3376c7bba7197661679ad9d6a4a4f55766a8f36869c0aca268fbf5db8ac4b3ba02ecb25fb9bec8aa914925c826c0e59046802d3bbe4d8 SHA512 45248b7498f316c8532dacd827a958d90fe40b10ec0c88d68f984816152bcd4c6ef22064d4a0582354a37962c590b67731b278311094ac4e257e89adcd9caf40
 DIST qtscript-everywhere-src-5.14.1.tar.xz 2654744 BLAKE2B 758469d0da17e81bbd05856af7028ae4660f9025890a477d4fafd6d37b3c9155301ec66514173d1fdf8bc77c155eb1c3826ede8b3f1df0ea40f8dbe2a9528048 SHA512 9f4fbb038319c93c03117f61380fc6d1064191f0b738de054c2cee2055e7ddbb06ce3d01855b22dc2284858569b4aebb4e838ac0c7432e123421d64909c1d8a4
 DIST qtscript-everywhere-src-5.14.2.tar.xz 2654528 BLAKE2B cb749d1db5774ef1e236ec82f57ca17fdb85bfec02f7dc346ceb0bb316783c8e1bdfe5b4d0a6339b3b91050a8a003b1fa221de10eadfd1f5b8828dced669c1d8 SHA512 2eef6c4d23fccd67abc3647852ca92edd951b4ece8047f28571689a143421c5a1403ef0fcc96615e4ed708df64f7eede643d872fac850554031a17e2d907f398
-EBUILD qtscript-5.13.2.ebuild 634 BLAKE2B 124b4870f804620017cbc5792a21ebc82e52c452adcb32c269095be3cb50ece1b49e1a15532cec368d20c91d9baa0d191f4a1a4e460464256b519988f17c7a10 SHA512 4a8ea286d3b270cfb2cef613ca81bee2f71bdda35cf536c2312316d655c910815b3b52bdf8b94472b794d1d3674f9c3bd62d258400fa45cbced2da1c90c544ae
 EBUILD qtscript-5.14.1.ebuild 673 BLAKE2B 66f10b67e1537f458f04eaa08f7e491a34c4933f10d37ef7651523adb57035edb7ac0ca950072e2fbda44663e89cb8e867e3ba903f38dfeee1f4173efb18ad09 SHA512 e34a5fede7ed1bd12b9ac64a8ba33dcc06282eb8917c31ef85d6473c09632ced63c6cd00baf5f50192f6855ea9111f7980f79baee14ed57c24dd682b9bba7998
-EBUILD qtscript-5.14.2.ebuild 678 BLAKE2B 0b449ad3b23cd214f0e96d45aaa95fc5f44d8e3ead2e39f01bea6d04515ff81096e972d7e0c3413096ad3f2b65a455c989bd402be40b4ff116128a7f9599b756 SHA512 e0e26d042129ac2745351dd1680aa96d08be783b06580cce163339aba3d25e483fad6056e8ffcd53d29b20e5dbab530801e5261daef7e5d6219b67a57a44b041
+EBUILD qtscript-5.14.2.ebuild 677 BLAKE2B cb7084d51b6bb2d7b24b86c080a9085feff60fa8f39b23fd3cc10d51e724d118011bfe5b26ce247b5fe4df6c94e71061fe987c7ebe89d3ba55e67e6b06ebc4c5 SHA512 679ed487a9f8b6369bd0baa8d8c125f6d2c8f3216a302fc1c7f216fe8a32a493f33bf74034fe099f7a7879d52f4ab229b0c92f292dd49301784a5372192f0429
 MISC metadata.xml 582 BLAKE2B 770c02c672a84e600bbbf91aa73e72947ff1e6944e0aec830ac24bc4b648197e78994bc949feb80381dff2af2e96c9792fe696059060c8c7ad3127a8992161d6 SHA512 d6ceb5cac55d142912f967e1336233aafbce4ebd981ca276f3f9f13214e1ec3576b04e89105e2b2b45cf9621a194ed09de581dc44092ee453dafb12304af8652
diff --git a/dev-qt/qtscript/qtscript-5.13.2.ebuild b/dev-qt/qtscript/qtscript-5.13.2.ebuild
deleted file mode 100644
index 10e70383dba3..000000000000
--- a/dev-qt/qtscript/qtscript-5.13.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="~arm"
-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.14.2.ebuild b/dev-qt/qtscript/qtscript-5.14.2.ebuild
index 34b9dbc92753..397e33ecd091 100644
--- a/dev-qt/qtscript/qtscript-5.14.2.ebuild
+++ b/dev-qt/qtscript/qtscript-5.14.2.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/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 4e4691ba86cb..85e3083bd237 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,7 +1,5 @@
-DIST qtsensors-everywhere-src-5.13.2.tar.xz 2046708 BLAKE2B 10c28aa33a372a84255ceb04f803e11df77137a6ea2ec7c84a3e07bcee5746b3e8d9d5c0e79ca97ba3b25401087dd434039c6f6b3400aeaba17e0ec4673ad1e8 SHA512 47fc4f9e5fd9451de38896d388b85e6c0813718a860ef7c98666e6a1710baf38e7056a61c799837eea4efef083b79f9c3a380364792fd0f3c107bdd413e1bc6c
 DIST qtsensors-everywhere-src-5.14.1.tar.xz 2050076 BLAKE2B 824f039b9ce960298906df3501554763c6cba211a4a828bc728d67c936a52b1eede7925c23c2326c666d25861536d7aa2943e74698445ffb93b0d9125bcf9ce2 SHA512 48113863561ca0e5ada249505f2e8dd20512c2591823f296e5a4aacbfadf24e221c7ef4564071a300aafb8dcd88e87bb27a864c4f36e534089084c347e2a7bed
 DIST qtsensors-everywhere-src-5.14.2.tar.xz 2050616 BLAKE2B 7a31fc1d57fd925baf8c3fb38477f5888334f64bf08f55ed557db85bca12d6e9d24bbf38e2cad0b74774712a1311a2554c35155507887d7c032d25ae28d47f1c SHA512 43872a51163317c2fb642f59a9e41ede77cb86d7148436d9e673ac94543fb8acffe4e040824dd88a9029943418a3371c77815b82a0a566426857d18fbc23e341
-EBUILD qtsensors-5.13.2.ebuild 496 BLAKE2B 0314be4d78fafdd88363903d57a13d598898c203049998127d50a75736629928a8537fc4ddfd3919ed0b9cd5cc604eba66c143e021bff750b70b12efd05e6d4e SHA512 5f7fcb947b6686a595bbb9366d2237d87eb83ecf97c81088e377e0465fbe912520f3440e7f80357c6368276265066934c48d49462728ed02a58152606dd82b5f
 EBUILD qtsensors-5.14.1.ebuild 537 BLAKE2B 09846ad156b00c2a438e9471f18eb3b73d5159109154d022a0dff148a7896e43f2b9f44ac2c9a79a200a6929fe89e276f0de6ae8ce1a51c582cbb0e651475d00 SHA512 c52ced19cc7395aa41aa4bd673c403880ab64196ab392d9849cb18a340667e4b06ec2642c54e20ba11fbddfc7ee77f840abb5eb71f71ca5fc836b66786f3ddd7
-EBUILD qtsensors-5.14.2.ebuild 541 BLAKE2B 5dcd6d002fc93ed5d9b6c16beb21a00232cead61bf2e5ae49764e306836fc64b0339b6b0859534535f74942ce9f1ed3414bd35e44cf50a37413269427747d590 SHA512 56a3f5c768d42c2b3d9e1575ff3477792d255a7cef1969c69317bcebaf82649dba4c31ac1ed64ef1acbfd168173270e4b963eeffdc851d0beeba88a6f96f30e5
+EBUILD qtsensors-5.14.2.ebuild 539 BLAKE2B 2ced0fc0a9f6863a0d09d3f1232ec515a9683880113d319ddf05d26bc45de809d0b0ea27f8f1dd7c1fbe19668d9a3adfac11132480991b1214bdc900820b5793 SHA512 be024b80bd2fb9cc287d9a7721ee308b24a697a51abec0dc259d9ef3c7b3251fa3006c2f3e76c7d8687751f717a044a46c7c3211ca8f2ed9befb2ab99f10da4a
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtsensors/qtsensors-5.13.2.ebuild b/dev-qt/qtsensors/qtsensors-5.13.2.ebuild
deleted file mode 100644
index 498d216d140c..000000000000
--- a/dev-qt/qtsensors/qtsensors-5.13.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="arm"
-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.14.2.ebuild b/dev-qt/qtsensors/qtsensors-5.14.2.ebuild
index 6780b05a4fcf..ff50b40a1c63 100644
--- a/dev-qt/qtsensors/qtsensors-5.14.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.14.2.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/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index e65f38fa471b..396d11720d37 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,7 +1,5 @@
-DIST qtserialport-everywhere-src-5.13.2.tar.xz 310736 BLAKE2B 559576dd0cb4a9eae1220e2801cde03debd80e7cc885b64630479fc9abb8d11c67c93a763a81a5faa482d811f1446fc294919661dbe0e33b8ecfa896f026b6a8 SHA512 e8655eb5f18179a922f96ab5ca0014dbf1da21b581f2e0fc146337321dae85b1218ed48724fb63b211ea7349f428c176543292284d5c2fae63a4e66146f68c68
 DIST qtserialport-everywhere-src-5.14.1.tar.xz 316528 BLAKE2B da634e8e230d7075a9b52130c82af193ee122f1c92e2b80357e81675f17ecd25c68f4a92446ba09958390b5dabd03faa3d04712e2a1b7b943b57a387b424d142 SHA512 89a48df4e31b6ea08b33ba1929b26001c2fc4dd815e7a1860e4a8c3d41437813cc9f0b13c5e2d64bf1357a5a81a619543264e013aa3ca2e5e2439e885ec270eb
 DIST qtserialport-everywhere-src-5.14.2.tar.xz 316492 BLAKE2B 38aaf7053fde382b0b161356fdf9ab97bdf08b6307bb97b704b846dc26a309b1256c6cb53e8caa0207ffb2e174387059debba0f0256f8893f60b1c1fce58fc5a SHA512 4a4fb81bcccaddc5902223940031a9002395cbc5e99c78c1ac5df04031b6a0551bb340757f84bad82ca7ef551358c1eba3a035b0b8f4221f7db0ab738ac65b06
-EBUILD qtserialport-5.13.2.ebuild 506 BLAKE2B 95841df14241ccf3a332f82e62843f6a1c794a3bdbc99d22ca75643d1a1eef1db8e606227beb51ef97b6e7745347af1c4167771156ba1b2799300fe5d37ab7e9 SHA512 8dc671f965e1fbff8437278f2b6bd241ba033094c33c0d9a4b78e2640a15b4157e1224dbf977122f13597b12c2a452859ae41290edf7e688fc3737c260f97d6d
 EBUILD qtserialport-5.14.1.ebuild 546 BLAKE2B f88631a3bd2b2ef16bdddf81e672ef2aa6af690cfa3e5039817ee3354a044fff4226cb98cdac062bf4fa5f1c35a4cf3353acc9335cde199fa281387783a73c7c SHA512 274c277a959e0ebe79940317c1113829e5aa88bc1ca67e68c7c687152d4cacde9f3b2e7a226fcaf5124df4601cca1a112dfa26acbed7acb3c5feaef50174dcda
-EBUILD qtserialport-5.14.2.ebuild 551 BLAKE2B 6350ce0559c0fe8bbd286800f537fc75a4acbeb3a66287abacfa48772b2963657a16f1a2178f75a18d66a8b9ba56820d8ffbd00adffd5018c5c1d54dc5d083be SHA512 8e19ac9c8b00974f144ed31c1540cf5c78aefbc6e1eba6df609b6a0a85ac4c78fc95399689c28394e998ed90247b4f5f4623edb33f9cf737864fef6658013554
+EBUILD qtserialport-5.14.2.ebuild 549 BLAKE2B 390e60af2b7b42a0eec924476ae6f62b03b26f775ef1115ae00e87c5d390f138e66023ab5ba25f9db243770bcbc9a058083540387d7df8281e8347e284e1b52c SHA512 3d5c7f11f553d325309e8da5e1c45e0f93f9ad7c26c10c471d337c3cfdf71e16978c77568f6438865d53e26a22b8e511ad94286c8d9919db6e0e33bb3de09a83
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtserialport/qtserialport-5.13.2.ebuild b/dev-qt/qtserialport/qtserialport-5.13.2.ebuild
deleted file mode 100644
index b1038a2a4660..000000000000
--- a/dev-qt/qtserialport/qtserialport-5.13.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="arm"
-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.14.2.ebuild b/dev-qt/qtserialport/qtserialport-5.14.2.ebuild
index d510efe398ec..737d42c1f333 100644
--- a/dev-qt/qtserialport/qtserialport-5.14.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.14.2.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 1fc43d4d3045..5c1818d1e26d 100644
--- a/dev-qt/qtspeech/Manifest
+++ b/dev-qt/qtspeech/Manifest
@@ -1,7 +1,5 @@
-DIST qtspeech-everywhere-src-5.13.2.tar.xz 100312 BLAKE2B c033b95351278d0cbe9a665a16a0b145bbbd6389f19ac63a166cc1fc63b60c3649bf48bae1e0060b855ac278ed240954afcd4bde9adc1a87742a0dc3299aa55a SHA512 9288cfbc37fd308deb41f287e3da38b5bdb83088fbc0f0276426f44c595a53fdc476b1e6122320f28a27f590e4801320eb14599dafa7491aa0d50be0bd124e27
 DIST qtspeech-everywhere-src-5.14.1.tar.xz 101072 BLAKE2B 53aaec0f74f516ddffb154401dfcad334e96f5ab7935e4aeb69d2ad20012c3006ef355b7733023ddd871fdb866aeabbbac809c03dd7d304cc303118e34e482ae SHA512 8249e374735a4a3de6b8795a5c09c9bc285eff8fc7e98e0a2446eb6b7306da1decd657bf92d5b8d195b042e7459097ce9129c8f6e4a23326f698c6e7010c46a1
 DIST qtspeech-everywhere-src-5.14.2.tar.xz 101100 BLAKE2B d37d08a2f7e6d40c7f6e68f9c4e301cdf9762ad9088a3fa0f9568af7211a2842b035e8f5eb001538aaa84385104d112cd6e550e32119099acee922f2dd13db36 SHA512 d3870cc66cba4f5dd2c0a2a4845defe4299de2d7affe12ccdadc4948116317590b580592d575cc5e8eb190043a92f38416e030f47cfb87f5cf3419a31152e00f
-EBUILD qtspeech-5.13.2.ebuild 417 BLAKE2B d3a074e51d83d7fa408b588cb0716bf188efca6ee7b19f00af343ff21c330cee26e76063bb5bf86d164970470f54bf860e51ad84e2f07592864402515a588493 SHA512 0a527d6b0f975f0399957b2d39feb8fedc3d4cc14f580bc5ebe99727bce3874d097ec269fcf3a1aeec8afaba7566a0d70bcf441f38ea3e8f000cca6bf53abc86
 EBUILD qtspeech-5.14.1.ebuild 440 BLAKE2B 96b4f7a9025b5a9635b5fe07c998a2a16b4547df7ee0738d092cf26de9ac5683ea21c1c1493a8366efc56131883a3ea4d37d84e7f32edef556eab86445f283ac SHA512 24d61a8707bddedd9dee8d1d76ff3a868505280115f62e264f9677a8c0b99306366f2672cb0385b878a3e74c26e973e8d03ed9b5f08de7f9b3f0784defb93bd0
 EBUILD qtspeech-5.14.2.ebuild 443 BLAKE2B 01cc92ada40c606dd525c64c2204527cf5f9ecea3a56ec9c78b44732e57566e0cf91ee933d1589c20a1ffeefb77fdb46a50521b846f18c8dda2336ff0fb4f252 SHA512 960505cf48951041c7ea2cd4a70e9ff7efd8cace21c5b64923cbba26815a0cdc2cf2f1472546000a1ff8ef5bc25902629861b161c932e6bb98d48e0daa652987
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtspeech/qtspeech-5.13.2.ebuild b/dev-qt/qtspeech/qtspeech-5.13.2.ebuild
deleted file mode 100644
index 465c0e9fce4e..000000000000
--- a/dev-qt/qtspeech/qtspeech-5.13.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="~arm"
-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/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 21d1e84b4ac5..3e915cdb4b8e 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -1,8 +1,5 @@
-AUX qtsql-5.13.1-postgresql-12.patch 4639 BLAKE2B 85edeacc1c2021bf5e6abe9f76d40c1ed64a1cd1c64ccad1b3f39397e87aa9ef14a26c96df471831a53e1f24ee75aa64fed72767de39e488d4f5f0a92540af1f SHA512 7d10071ab49f31971c6f8045e2d0a2d7fc74ed9bab16b0e7dcbde796a3f9ca430b2db9fbe6c3a8217ab8d998abcf29770b7ee4572a524ca1923691a878e13567
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtsql-5.13.2.ebuild 1301 BLAKE2B bce26d1cedce548f319dbf1cb5f78ac02fe12e5880f22b0b6d2a2e490678e5b671a846827d2cfa37ea30e4c89eabb3de6d599fb409c9262392d3e5cccfd04bca SHA512 b6cf3c11bd3071a35dd2f56734e3e17feea408c8925eda3c35556192ec8e189bc3f2a1055e3ae82d47281cd92f5c9b73e1fd974f16776e6d27b19fa7f7c46e71
 EBUILD qtsql-5.14.1.ebuild 1237 BLAKE2B 971a72b1d782c93c70b076a7738e6dc2736bc958d6626a4ff23f66e503b7ab6ed4b853cf508f21cb81181b2dd6bc095576a3620c7225a1bc827f16f6db30b43e SHA512 377ead8cc7956b0ab0630d21f776b218078072e490adac114fbf9c496441803d671634c9277d3dec119dd0546211f08138b79d98ee87c8d52ba0359f10d922c7
-EBUILD qtsql-5.14.2.ebuild 1245 BLAKE2B b2306d8520913bc9532e8e3c1913dfc54afd485e670fa2f556d02fbe8ae11bb33e53cbe98fbe897f9be6b6031b1b5c894f24430cd9c58d984b2e3f5a2a5978c2 SHA512 2b3fd69def9c1c24f672f78600daf57d1f85f5f0f4971b6488d280f9318cd182fde889040ecc883888fc2d0675499baccc5d615f1e40c39a9df34c6388fd9d3a
+EBUILD qtsql-5.14.2.ebuild 1243 BLAKE2B dc620facd67f743b7b76d8487176a8c53c4ec1cb9549c0de02304c61d64eb45ad358d9bb538e9a486b5a7c16e594fece629c65b028c6a2347fb0c082d14a2cec SHA512 6296749a01ac4095ce83c0875eb0b5066ed0d4023b4e49e3f4b513f5716893a8acea24868646a09b91353a680c7086180b1af2c023ffbdd5e65c2624e1b0310a
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch b/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch
deleted file mode 100644
index f41755adff95..000000000000
--- a/dev-qt/qtsql/files/qtsql-5.13.1-postgresql-12.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 14b61d48e8bad6223a08843cf363ef48f09c479b Mon Sep 17 00:00:00 2001
-From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
-Date: Fri, 11 Oct 2019 20:53:49 +0200
-Subject: [PATCH] QPSQL: Add support for PostgreSQL 12
-
-Add proper version check and replace long deprecated and now removed
-access to pg_attrdef.adsrc.
-
-[ChangeLog][QtSql][QPSQL] added support for PostgreSQL 12
-
-Fixes: QTBUG-79033
-Fixes: QTBUG-79064
-Change-Id: Iec1b13945c34ea017139ad1c5539ab5b7f1e03aa
-Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
----
- src/plugins/sqldrivers/psql/qsql_psql.cpp | 43 +++++++++++++++++--------------
- src/plugins/sqldrivers/psql/qsql_psql_p.h |  1 +
- 2 files changed, 25 insertions(+), 19 deletions(-)
-
-diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
-index 3803f05b9f9..760685f64b4 100644
---- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
-+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
-@@ -1078,8 +1078,10 @@ static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
-         return QPSQLDriver::Version10;
-     case 11:
-         return QPSQLDriver::Version11;
-+    case 12:
-+        return QPSQLDriver::Version12;
-     default:
--        if (vMaj > 11)
-+        if (vMaj > 12)
-             return QPSQLDriver::UnknownLaterVersion;
-         break;
-     }
-@@ -1439,26 +1441,29 @@ QSqlRecord QPSQLDriver::record(const QString &tablename) const
-     schema = stripDelimiters(schema, QSqlDriver::TableName);
-     tbl = stripDelimiters(tbl, QSqlDriver::TableName);
- 
--    QString stmt = QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
--                                  "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
--                                  "pg_attrdef.adsrc "
--                                  "FROM pg_class, pg_attribute "
--                                  "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
--                                  "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
--                                  "WHERE %1 "
--                                  "AND pg_class.relname = '%2' "
--                                  "AND pg_attribute.attnum > 0 "
--                                  "AND pg_attribute.attrelid = pg_class.oid "
--                                  "AND pg_attribute.attisdropped = false "
--                                  "ORDER BY pg_attribute.attnum");
--    if (schema.isEmpty())
--        stmt = stmt.arg(QStringLiteral("pg_table_is_visible(pg_class.oid)"));
--    else
--        stmt = stmt.arg(QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
--                                            "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema));
-+    const QString adsrc = protocol() < Version8
-+        ? QStringLiteral("pg_attrdef.adsrc")
-+        : QStringLiteral("pg_get_expr(pg_attrdef.adbin, pg_attrdef.adrelid)");
-+    const QString nspname = schema.isEmpty()
-+        ? QStringLiteral("pg_table_is_visible(pg_class.oid)")
-+        : QStringLiteral("pg_class.relnamespace = (SELECT oid FROM "
-+                         "pg_namespace WHERE pg_namespace.nspname = '%1')").arg(schema);
-+    const QString stmt =
-+        QStringLiteral("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
-+                       "pg_attribute.attnotnull, pg_attribute.attlen, pg_attribute.atttypmod, "
-+                       "%1 "
-+                       "FROM pg_class, pg_attribute "
-+                       "LEFT JOIN pg_attrdef ON (pg_attrdef.adrelid = "
-+                       "pg_attribute.attrelid AND pg_attrdef.adnum = pg_attribute.attnum) "
-+                       "WHERE %2 "
-+                       "AND pg_class.relname = '%3' "
-+                       "AND pg_attribute.attnum > 0 "
-+                       "AND pg_attribute.attrelid = pg_class.oid "
-+                       "AND pg_attribute.attisdropped = false "
-+                       "ORDER BY pg_attribute.attnum").arg(adsrc, nspname, tbl);
- 
-     QSqlQuery query(createResult());
--    query.exec(stmt.arg(tbl));
-+    query.exec(stmt);
-     while (query.next()) {
-         int len = query.value(3).toInt();
-         int precision = query.value(4).toInt();
-diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h
-index 99e0b5f60f5..9ac1fb50d79 100644
---- a/src/plugins/sqldrivers/psql/qsql_psql_p.h
-+++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h
-@@ -93,6 +93,7 @@ public:
-         Version9_6 = 22,
-         Version10 = 23,
-         Version11 = 24,
-+        Version12 = 25,
-         UnknownLaterVersion = 100000
-     };
- 
--- 
-2.16.3
diff --git a/dev-qt/qtsql/qtsql-5.13.2.ebuild b/dev-qt/qtsql/qtsql-5.13.2.ebuild
deleted file mode 100644
index 4cdae4a99742..000000000000
--- a/dev-qt/qtsql/qtsql-5.13.2.ebuild
+++ /dev/null
@@ -1,60 +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="arm"
-fi
-
-IUSE="freetds mysql oci8 odbc postgres +sqlite"
-
-REQUIRED_USE="
-	|| ( freetds mysql oci8 odbc postgres sqlite )
-"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	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
-)
-
-PATCHES+=(
-	# Backport from 5.14 branch, bug #696870
-	"${FILESDIR}/${PN}-5.13.1-postgresql-12.patch"
-)
-
-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.14.2.ebuild b/dev-qt/qtsql/qtsql-5.14.2.ebuild
index 4853177b0b96..38e4f9dfa561 100644
--- a/dev-qt/qtsql/qtsql-5.14.2.ebuild
+++ b/dev-qt/qtsql/qtsql-5.14.2.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/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 07921c9b0409..e891e37d51ed 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -1,7 +1,5 @@
-DIST qtsvg-everywhere-src-5.13.2.tar.xz 1890380 BLAKE2B 7b15ea615afe387e39ef4aec60489319230447abe560bbe2ce5dcc283a6ed6d49a44971306baf51791ac910feb25896324d48a21ff3a85ffa4a480354c077ceb SHA512 fbe2df9e8756c8982c0e91c0d0356e50dd22d898087dfd028dfa6ed363ea18e1ddce5d5838d705e2d31509d1d823ccddcaf5f8916c587919e10a39ae04ee0090
 DIST qtsvg-everywhere-src-5.14.1.tar.xz 1879708 BLAKE2B b3af3b007b0a80cb90af361526e09439510e977047bae784728dddf7daf00e2c35d58315423a0ebb4b7326a55957a8d51f19829edd9a371a522625e6a3faadcb SHA512 022f2a4ddfb13e8b35746394f968b117b38bb805869cf3dd8f354d3e76b3e64e47414e9d12dcdb04bcf2162b520ee5521836d6ee4a6d1257e7f1e5ec565ca821
 DIST qtsvg-everywhere-src-5.14.2.tar.xz 1880100 BLAKE2B 285732e614c5aaf3a4ddb644cdfb3cd35708985d79d6ab3aa5917fde35d43fd656b5c6fbc5f08764b6413e5f0aa8919f70966791ece15fbb2d96c38b9575e27b SHA512 b4cf8a7081e01caea3c71826d32ebb9da6a71bd4eab3cf353e87080009065aff2c533300c0c08a005ff8f441d2da641a097319114a5c11b618398fac41f574a7
-EBUILD qtsvg-5.13.2.ebuild 412 BLAKE2B 15779731e84997cb8b35cf0c7bf9b9d0567b2a244c7c284c2c5dfac5ab940ed8cc7ed5c9d4c731f0c21cba6e4f4cf6494f3c1bc46df2e099840e7282f8df886d SHA512 539be315bb741e3578ccaaeb52878fef41b60f212c693bdb150662c3aa50e4a10eea57fff90905aa7eb3b2e2be60bfe1e7311135b70e8680206163e017eee21a
 EBUILD qtsvg-5.14.1.ebuild 452 BLAKE2B 2219f20aa036229b6cac0f8d2bcf95cff6eb93d9b29ab80384f0b63d0cc07963df7624b383a43328e3d413d3b88d418742e92570d5ebd91cdc9614f831c89511 SHA512 a6c58a1362b769a3260ec0b5fa3d659ed1e3d91bb1bb72c6b033dfcc7d14029ba9893d49a08d06ad6b9c533be79ce332242852518305c12ec59170bef11f4c99
-EBUILD qtsvg-5.14.2.ebuild 457 BLAKE2B 6465e3adcb5719db36899e6a68af8f3dde1e6ae72b321f845bc78c46e6533f334dea6ef7e5863b4d55fd2c9e1a724844e864728064c6f63ddb6221732650e5b3 SHA512 21de92c7242d66faa1fcb8fb1d3624b3769803147c2d5edce05a03fb745c26a37b5a4c96a9a153e19645d6d41519adaf86a5f10a2d3e29a8cfd31d0198b1a49c
+EBUILD qtsvg-5.14.2.ebuild 455 BLAKE2B 686e89ed68c9c32e068975be91fe809b6e7246fdac0bcae3fd111b516c13c13a9877359c5594423e3faf96efb01a0b0c5eb11de2feeffb9620f67b114af6df7c SHA512 fe644ce85e7a46f45d8d487cb6ea50b71d1071f29bb4cff9909e9b21cb4e5896884ed5efd84771054d31a3ad7a95637ca8c4eaac6aa8fafb158e0f9fefe3c8e0
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtsvg/qtsvg-5.13.2.ebuild b/dev-qt/qtsvg/qtsvg-5.13.2.ebuild
deleted file mode 100644
index 02d30fb89227..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.13.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="arm"
-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.14.2.ebuild b/dev-qt/qtsvg/qtsvg-5.14.2.ebuild
index 9584f7c08b50..cdd88ae5c170 100644
--- a/dev-qt/qtsvg/qtsvg-5.14.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.14.2.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 ac6863c1481f..24148ed4d38d 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qttest-5.13.2.ebuild 496 BLAKE2B cac3f18a04015b4e744e8ba9b2fc17fbd9a29029e3b396126e59c720f65d604481a85d0a64f05769e60f9d15fce89321b59c5a3ebe7dcf5f30d5138c564a1def SHA512 cc7e4ce9b86e77cede42d643858faec31f26c75b06d49f9e9d7b0ad0371cc93563fd63fbe851e1ab7f9a87576850e25e1265b1be567ff7d62dfac456745e0e53
 EBUILD qttest-5.14.1.ebuild 536 BLAKE2B c3bbdf564e2e2e2c333b95ff772e57c19a637bcacf14ee880ae93904f572749380088dc9f0f909ff555663a97167eeaf53d614a68a67c81aa9c4feea58b02b5f SHA512 14435f2667e8762152eee13a7a2fd70c961176e3902176ba531426b912bf860d66ecabccd776a8d251ba59f2ab5e3d9f8bd32b22cf2bc4033ff6c6bb10dccbd5
-EBUILD qttest-5.14.2.ebuild 544 BLAKE2B 745af979b2651358e3184e953260b736c9a0231b427bc9a0fe540421e68dda5e1dd95fe4c892f6c311b44b963c7cd6ee2ef244bc08fdef117e0f9dc81fedd5f5 SHA512 f78087bcf51747557cf3c0299638981958bf4503edc9ed97a0c479a836655814d48b2f78d18fdd10f05db661b33a63915b746422dc53eb6669d2c3d1ad54d1aa
+EBUILD qttest-5.14.2.ebuild 542 BLAKE2B fa19027a68e0ada70ba1002d6a726349ebfceca2b527de4438e6f3922994e745b66c1a6e6c6740ca55eac81cdbbdd27caf86649aa4ecad36037f96c1f917691c SHA512 5d221a8863d99d98537a91fc021f1b20bf489aed9aacd5e19f9d4d1ad16cb1102c42749d3cf3aae555fca4b439a1580452cf8896e3bf0b2a0e86dc35da949a67
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttest/qttest-5.13.2.ebuild b/dev-qt/qttest/qttest-5.13.2.ebuild
deleted file mode 100644
index 5b22143bec6d..000000000000
--- a/dev-qt/qttest/qttest-5.13.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="arm"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-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.14.2.ebuild b/dev-qt/qttest/qttest-5.14.2.ebuild
index f73f2420fd6b..5a1fd7d647a2 100644
--- a/dev-qt/qttest/qttest-5.14.2.ebuild
+++ b/dev-qt/qttest/qttest-5.14.2.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 6209a051f5f1..dfe2e1416655 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -1,7 +1,5 @@
-DIST qttranslations-everywhere-src-5.13.2.tar.xz 1365880 BLAKE2B cca622d9bfd4573075a73ae63033592647ad1d79e0c77cef5a7b12829559e1808f8985bb4de110ad4a0eab2889acb326555efc9fb7eee98571827bdeb6705247 SHA512 c2e3af076a90920d571bd12c6a9a218f2756bf52922dba37826791cc9d3e5b027b1d21d83f18dba76f20c029c53a91da396b56e68fb26c3d769a7ba06a3ca855
 DIST qttranslations-everywhere-src-5.14.1.tar.xz 1348664 BLAKE2B 49cdc517dd148fe7b8a96c788533a7a5bb3e94e390db04e509177b4af908bf31c6f2f7784188e353779519315c09fad45f21d0a2e73c6e4beda190df9d65ecf7 SHA512 e90a630fc1014543c3dd07379a7a4098664e25ec59e7c67ec8f9367e015a4351f8914954d3334ff44508a417cbd55a8dcf6f03c91aa75217fc723749726534d3
 DIST qttranslations-everywhere-src-5.14.2.tar.xz 1348684 BLAKE2B f72cb65813c9b21d57eb6673d193fd6f67d65ced740622567b39333714a8491e3ffa2edd729aba917fae8883d693fbd68c567ca03cd243ea734804e1862b4794 SHA512 38cedf19a1d7b920b7dcfcc014d3986c4067dafd7192efe43c3b8f282e0637391f9ec0b8cc7f5506cc76629d005298becba1421506b48c6baf3366ec2f378544
-EBUILD qttranslations-5.13.2.ebuild 333 BLAKE2B 9d9166cfa9949a5f72001b727be776ec69c34c30c70785af80f9986ab1d6123686065e6b0b543183a76b938bdc373555735c7701677d34d7eb94cd2781076e8a SHA512 754d184190767dba72d92c9eed61bedd215821b4a9c840ab4ba4026c6b2252e114cc7bbd23a7e96b18639c4bc6e0b06c872dca3ba93991f24f8292ccfc4d6a5b
 EBUILD qttranslations-5.14.1.ebuild 373 BLAKE2B a9793d255a132d39a5e959a5f6ed5adae0aa2017051393eefbd60d3091c1171f2775e7db9c473c2c06d970f119bbf8ca94519d1bb86a77b6be1df5bec524a2bd SHA512 7d813236a7a1a93a0ff5e3260f40590c6ea07a05bb84366a17385045f1c40109eb4847803ae9cad5bb96928b6278445afe2065456140054a6faa5b1507c72de5
-EBUILD qttranslations-5.14.2.ebuild 378 BLAKE2B 0d7d779be190e94f2013cdc097ee2376f828c846570b9b06bfc81d7248e4978af2029efb2e04b9c8c57ac309597de630fd6600828d0ab81928c7434f77f1dbbe SHA512 30ecccf1ab074aee9284a7dfb256b8f82a7eb73877d6c0a0e39265ba42c40c87bd0fbc63f56fc7ebc5fdcdae60a7dec147fe442ce64d17e6ab85ff58c6628e0a
+EBUILD qttranslations-5.14.2.ebuild 376 BLAKE2B 6a6c030700b90465e07ba8d192d93d66626c707de15188281ac6ec7ca156e000cc9a80fc21e759c059ee5d788010fdb8ef1f0c4b33577d7fda209855324134a5 SHA512 2e8938b1351df5e81d30f4a3613c8d7e47142ae7dfb8a515ad6198bbd437a32bb48d7ad515064f03e51e06842f999a754e10f9143739bca687ea7b2a8f72583d
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qttranslations/qttranslations-5.13.2.ebuild b/dev-qt/qttranslations/qttranslations-5.13.2.ebuild
deleted file mode 100644
index 302854904b2c..000000000000
--- a/dev-qt/qttranslations/qttranslations-5.13.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="arm"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/linguist-tools-${PV}
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND=""
diff --git a/dev-qt/qttranslations/qttranslations-5.14.2.ebuild b/dev-qt/qttranslations/qttranslations-5.14.2.ebuild
index b882082d4fe2..333f866b557f 100644
--- a/dev-qt/qttranslations/qttranslations-5.14.2.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.14.2.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 130c40fe4929..fa2fb60a33c1 100644
--- a/dev-qt/qtvirtualkeyboard/Manifest
+++ b/dev-qt/qtvirtualkeyboard/Manifest
@@ -1,7 +1,5 @@
-DIST qtvirtualkeyboard-everywhere-src-5.13.2.tar.xz 10923292 BLAKE2B be6eedc1c1c2246e019e22fbff01f9a307f80bc2e32d9a48eabad792d89c188e92d409181b934bc991f28acb31e6331b601e544e799f362c439dbbf0e5f73db7 SHA512 63b6b1ba7ad00db3ac019b8380e76a7881d3c85cdca62d4d539b0e84bf049880f2d1405ed90cd44259821488b582762af97ea3a06b1bc5cd5e5d975663cb613e
 DIST qtvirtualkeyboard-everywhere-src-5.14.1.tar.xz 10950684 BLAKE2B 4618ed63101c6f76fa33e921feefe63d4ab0541ed2722fb41c5d85879284b5747b1748401c80e3f406de47093f523a53014fb45e43b0be664f8751ea40097b4b SHA512 e9e6605590a83d394ed2cb37fffcaef0ae84cc09bfcf388b95c34aa686f4cc40e8f29fa5441a979cca71f5fdb9b53b777658c2d756226483f6104ce20517f42d
 DIST qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz 10957372 BLAKE2B 9fc84f0ee58a235e7a6291030ce8c8f9271789b7f62bd39b9fd9d0f23a47703c147c388ea89187527ba60902e03c0a145291c3ead1a185d3e771a982ce4c0430 SHA512 752634de8796a1809818176db47021aa24de842cf6334d689a91d3b011105a5e2b8113615a8f50f6974bf8fa989026b434121b42278de1ef905075ba3ee72c47
-EBUILD qtvirtualkeyboard-5.13.2.ebuild 1183 BLAKE2B c2f79a940f03429745abc82649caec13dd239c318875b150bc1eeac3ef5adb27dfe76cabcc73e315596055f4a17b7f590d0914a9f651383cb079609943bb551c SHA512 ba9d3c67836dee757bf76b350f3d644f38ad55046f0b3080b7db0b29fd51d7483cb42b4319fac2700df50b1ddeb9c2dd461f406b435a18ffd4cb4706dd28845c
 EBUILD qtvirtualkeyboard-5.14.1.ebuild 1201 BLAKE2B d201ef8f92d1649837343c87c22cdfdc78cd2c2612ec39c4a73d73a8d5d537d7f43f0c8b47c7ce9ddc32403e287e420db4329a0b3467a36ae9e964df5014089d SHA512 e88986a762232a2db2081588a3b09ff6a8138e438ec2a8331710ccc99ca9321d8285c5ab1e7b560026a2ab72e50b3da0677d07906fe818f79a4cc0795d9155d4
 EBUILD qtvirtualkeyboard-5.14.2.ebuild 1204 BLAKE2B 4d949aa5df208fc05f2bacddb224b288bde6bfcf64f6d4ccc26a511645f39fd4e29694376fba343123d1dfc966b6918ddf1c8ae7dd9b9b4d7923b74c61fb7721 SHA512 9546e67d4f5ccfbbe17c76a21a0e67959f6872a1c1550113b8dd7cb7e2d485cf048e52b52ad4577f3bcaeb544bca7040eadb8d67009e5129ac0552dccd72ce77
 MISC metadata.xml 579 BLAKE2B 831918738315acf3bdb4e5f0b7946cfda2c0a2c772f586e2605af277111b21eb32f818d73388f965c204d0b263faf500f44ea270155b15069de4be454d69ac92 SHA512 96b897699828afe8027d30da6a77ab6ac2ffb40c4496564a1f0d7db51078303bc5af940c462ebaa4409c0aaeb70e3215584f0d8fb664837757603f7a535868e3
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild
deleted file mode 100644
index 53f2d0ca7bfc..000000000000
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.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
-inherit qt5-build
-
-DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~arm"
-fi
-
-# TODO: unbudle libraries for more layouts
-IUSE="handwriting +spell +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtsvg-${PV}
-	spell? ( app-text/hunspell:= )
-	xcb? ( x11-libs/libxcb:= )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myqmakeargs=(
-		$(usex handwriting CONFIG+=lipi-toolkit '')
-		$(usex spell '' CONFIG+=disable-hunspell)
-		$(usex xcb '' CONFIG+=disable-desktop)
-		CONFIG+="lang-ar_AR lang-bg_BG lang-cs_CZ lang-da_DK lang-de_DE \
-			lang-el_GR lang-en_GB lang-en_US lang-es_ES lang-es_MX \
-			lang-et_EE lang-fa_FA lang-fi_FI lang-fr_CA lang-fr_FR \
-			lang-he_IL lang-hi_IN lang-hr_HR lang-hu_HU lang-id_ID \
-			lang-it_IT lang-ms_MY lang-nb_NO lang-nl_NL lang-pl_PL \
-			lang-pt_BR lang-pt_PT lang-ro_RO lang-ru_RU lang-sk_SK \
-			lang-sl_SI lang-sq_AL lang-sr_SP lang-sv_SE lang-tr_TR \
-			lang-uk_UA lang-vi_VN"
-	)
-
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index a64919116779..a60d4997b30a 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,10 +1,5 @@
-AUX qtwayland-5.13.2-fix-crash.patch 2173 BLAKE2B 80e797f7ce25085cddd4d9721e61cc94c48ab7310a9cd7f357bc0e6467f759a5c313564af808d4f5d6ffd1b5231731df5a69a6c01f876be6d9e53eb73084b23b SHA512 0071413c1bac608ad7591bb6e6b329424ed3dfac6cf1826cb9cedb512df83563fa995964fffb6e0b8ca47063b52835ffa8aeaf5612dbc72c0e916bd353c03965
-AUX qtwayland-5.13.2-fix-linuxdmabuf-build.patch 1052 BLAKE2B 7b184cbc66f5dab2dc8b640ae307f647bc4aea4772a5e74c5ee2be652ed2a90d6e682c4fafb9944d027022686f2be0cc666b2266051134ad57d7194f18eb48c3 SHA512 3c1c2b13c2ff632469f0e1f6c2d642303d359368343e679726d61357d8e104c483b6b3259f5e3b11961f64257f9d10b50d0bb2aa7d166eed5ffa5aaebcf58132
-AUX qtwayland-5.13.2-fix-touch-ignored.patch 1274 BLAKE2B a643a7df480ddf24939406a6479edb10a615ce031e249325c8509140c65c1377d58d37d29056fbd92cb0b943a01c4be0ec1408c5924e3bde8d07d8a100ae8554 SHA512 abdb8201873652510615e4d4db7ec3b415ba8f4f9db5b6258a4548101a25ea46c131d8bbb7d0d615aa4de384546f3d8ba6f299fa3fde3b0fbe5427b9e48103a9
-DIST qtwayland-everywhere-src-5.13.2.tar.xz 495536 BLAKE2B eb4352d76caba9ff1d217950b8be40edee1b963a085ca129938ade0d3a68569856bc1a745951d3731c81182b341704568a5036551693cad5926a239587dd506b SHA512 5eb895c2ef8e2e72b71fed027f760913bf754da213e488a6103d9034170a6333f034b3488115a87a5a4e90761425487b9a8ab8e84a68e2e614c159d747408d53
 DIST qtwayland-everywhere-src-5.14.1.tar.xz 544744 BLAKE2B cc74e6ac4519484713795169a91f18ed2535684bf604d12ab900a0fb2502d30c1fa4fbdc5899c4a32505e8f4b2be142d3b16540b6797c1624deac097d45ea41d SHA512 6cdfb527ce8160b562343bfb3959dfcd8ccc91a50817756547f4a0559b77372bee7587bc2e4e658e15b58ecb52c6eb0ef2193e30a285d13c4192bb03a1149cfc
 DIST qtwayland-everywhere-src-5.14.2.tar.xz 544532 BLAKE2B 13cf07116737ec2fd301f51f517cbc062fdd42b800d6d2739193f3570f1a9552e66e9909de15c22cc530d5284c3be9ff24915ce4b36f529ec6c22faeb0edff58 SHA512 0f396cabace17f099c2f2c0be54317006dc00c5f4be08cd79a4fa4fdc94362f63cc6ce9decc7feb63f566dd2ea52d562257e4bb23332557054418fc16dc7e899
-EBUILD qtwayland-5.13.2-r1.ebuild 1320 BLAKE2B 9344c1b8e41ca9e15709de22b0c3c02f154e75441a58494d852d08d13fa179d17336380ab8fd4480ad2e1b8ba62fba2da71daee86add5fb2eee3753754539ea6 SHA512 76b3880ad3d064d6d63a34695f3e39552bcc13afbd67aae94dfe89e6d0e788a4f65319ed377de1567afbf70fd51cff5a2e6b591bcde119911dd77dedfa47e502
 EBUILD qtwayland-5.14.1-r3.ebuild 914 BLAKE2B 4e32f25761bdf73ccf6d5b2a4351e155d272515584d97c858d6057df871ee3aa60237ec73ee5a6c3a9274e41ac0df0ddd8dbb1da4497e640e9ba5324cd16ab9c SHA512 41dc0ea2242c0b55f8879047f221b97067f5e47cf5b29af67a3d99cba62f6cab54039b72f13744395fb6aca66f3858c60b1982d6d60e6e98d6552af0cda67367
-EBUILD qtwayland-5.14.2.ebuild 926 BLAKE2B 2acdf36e81cf827a7c1b8cadf14ff8dbf2e599aebf32ec3a4b52a32b246624ef1ebb251b83d9f0a251293a01b08b3389d936787e348dfe9a0025b404b992fd04 SHA512 9b230f63721a1f26f32c951e106196d3a2cecad1520d7fe1a2c362937af13d4e4a0e332b678ed5d9303b36804595e3fac1d22dc32096b7d015e325115a6acfe3
-MISC metadata.xml 680 BLAKE2B 4ec031890956f3b2cfcb6c53678ce58580ad11416f1a4b3c20c5fe07d5e8bfa4c06999bce68491487a3d3fd98bc5994472138cd2bb10d012657d852d74c01eec SHA512 b76508be78d0b3976fe4d3e7af103dd0b0749fbcd84a63ffa7d97e527fbadbd06973ab4af18a37eba4e6d256512a1e2453b90c990f288b994cc6997cdabdefd6
+EBUILD qtwayland-5.14.2.ebuild 924 BLAKE2B 8e96394a8d68df6b4301c884bef2aee9d66d3d90ceb717b8175d9dc6ab6bc1c2215e5407c6ec9cf460a312c1ca45e68e752f5710c327836a3c3f2a965fef6686 SHA512 07a0492307b13d4b49c853cd770b8955b830b73dbe5766eafa4be47f7ce265f3ba636c4805101f4489c3965da23dd6bca21819841c385f8bd414a05245f1d11a
+MISC metadata.xml 583 BLAKE2B 2f04d6e39831120e7a38de5172b26f29bdb19e4677588595e5281000b14dc5ebcc0984fde5e99330807f8c400b7abb3c0cfbdaa7f131c815d60680259532cd3a SHA512 3b76305c692c7e9b2f0d82862ced25a4a306fc23611f7c22dfed3b19d55072373cca7bf2d4e6bfc14276986082cebfe19e7637c780acde1f421bb1baaf95f27a
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch
deleted file mode 100644
index b4e78684bb61..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-crash.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 962b9be7992cef672cb6307af5653c97382c334f Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Fri, 1 Nov 2019 11:24:26 +0100
-Subject: [PATCH] Client: Fix crash when showing a child window with a hidden
- parent
-
-[ChangeLog][QPA plugin] Fixed a crash when showing a window with a hidden
-parent.
-
-Now we just avoid creating the subsurface, so nothing is shown. Seems to be
-the same behavior as on xcb.
-
-Fixes: QTBUG-79674
-Change-Id: Ia46fcd9a0da5aad4704816a41515cb1e128ac65f
-Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
----
- src/client/qwaylanddisplay.cpp | 4 ++++
- src/client/qwaylandwindow.cpp  | 7 ++++---
- 2 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
-index 78524f6fc..27e38ccf7 100644
---- a/src/client/qwaylanddisplay.cpp
-+++ b/src/client/qwaylanddisplay.cpp
-@@ -109,6 +109,10 @@ struct ::wl_region *QWaylandDisplay::createRegion(const QRegion &qregion)
-         return nullptr;
-     }
- 
-+    // Make sure we don't pass NULL surfaces to libwayland (crashes)
-+    Q_ASSERT(parent->object());
-+    Q_ASSERT(window->object());
-+
-     return mSubCompositor->get_subsurface(window->object(), parent->object());
- }
- 
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index 8d34afd1f..7098568b4 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -124,9 +124,10 @@ void QWaylandWindow::initWindow()
-     if (shouldCreateSubSurface()) {
-         Q_ASSERT(!mSubSurfaceWindow);
- 
--        QWaylandWindow *p = static_cast<QWaylandWindow *>(QPlatformWindow::parent());
--        if (::wl_subsurface *ss = mDisplay->createSubSurface(this, p)) {
--            mSubSurfaceWindow = new QWaylandSubSurface(this, p, ss);
-+        auto *parent = static_cast<QWaylandWindow *>(QPlatformWindow::parent());
-+        if (parent->object()) {
-+            if (::wl_subsurface *subsurface = mDisplay->createSubSurface(this, parent))
-+                mSubSurfaceWindow = new QWaylandSubSurface(this, parent, subsurface);
-         }
-     } else if (shouldCreateShellSurface()) {
-         Q_ASSERT(!mShellSurface);
--- 
-2.16.3
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
deleted file mode 100644
index f9b6b6571182..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-linuxdmabuf-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 23ea5504200ff5f7e40bd264280a78db09c1bc5b Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Fri, 8 Nov 2019 13:58:04 +0100
-Subject: [PATCH] WIP: Fix compilation of linuxdmabuf compositor plugin
-
-WIP, because I'm not sure if this is the way to go, but it fixes
-compilation on my machine.
-
-Fixes: QTBUG-79709
-Change-Id: I3190ef56e0e162636efea440dff7e760cf11fcd0
----
- .../compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h                    | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
-index 2abc2ce6b..d1f4a3039 100644
---- a/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
-+++ b/src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h
-@@ -53,6 +53,7 @@
- 
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <EGL/eglmesaext.h>
- 
- // compatibility with libdrm <= 2.4.74
- #ifndef DRM_FORMAT_RESERVED
--- 
-2.16.3
-
diff --git a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch b/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch
deleted file mode 100644
index 4a33d97bf17e..000000000000
--- a/dev-qt/qtwayland/files/qtwayland-5.13.2-fix-touch-ignored.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 57c28f461a066c03ef8ae3f823c040fa91876fb8 Mon Sep 17 00:00:00 2001
-From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
-Date: Mon, 4 Nov 2019 14:21:18 +0100
-Subject: [PATCH] Fix touch being ignored when down and motion are in the same
- frame
-
-The Wayland protocol gives no guarantees about which events are part of a
-frame, so handle the case where we receive wl_touch.down and wl_touch.motion
-within the same frame.
-
-Fixes: QTBUG-79744
-Change-Id: I5dd9302576d81da38e003c8e7e74da6a98def603
-Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
----
- src/client/qwaylandinputdevice.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/client/qwaylandinputdevice.cpp b/src/client/qwaylandinputdevice.cpp
-index 8f3df8e4d..193ce714b 100644
---- a/src/client/qwaylandinputdevice.cpp
-+++ b/src/client/qwaylandinputdevice.cpp
-@@ -1062,7 +1062,10 @@ void QWaylandInputDevice::handleTouchPoint(int id, Qt::TouchPointState state, co
-         tp.area.moveCenter(globalPosition);
-     }
- 
--    tp.state = state;
-+    // If the touch point was pressed earlier this frame, we don't want to overwrite its state.
-+    if (tp.state != Qt::TouchPointPressed)
-+        tp.state = state;
-+
-     tp.pressure = tp.state == Qt::TouchPointReleased ? 0 : 1;
- }
- 
--- 
-2.16.3
-
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index db7a41ae479b..85cb4f0e4bfa 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="libinput">Enable support for input devices via <pkg>dev-libs/libinput</pkg></flag>
 		<flag name="vulkan">Enable support for Vulkan-based server buffer integration</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
deleted file mode 100644
index c7be17907c21..000000000000
--- a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,50 +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="arm"
-fi
-
-IUSE="+libinput xcomposite"
-
-DEPEND="
-	>=dev-libs/wayland-1.6.0
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}[egl,libinput=]
-	media-libs/mesa[egl]
-	>=x11-libs/libxkbcommon-0.2.0
-	xcomposite? (
-		x11-libs/libX11
-		x11-libs/libXcomposite
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-touch-ignored.patch" # QTBUG-79744
-	"${FILESDIR}/${P}-fix-crash.patch" # QTBUG-79674
-	# Pending upstream:
-	"${FILESDIR}/${P}-fix-linuxdmabuf-build.patch" # bug 699190, QTBUG-79709
-)
-
-src_prepare() {
-	qt_use_disable_config libinput xkbcommon-evdev \
-		src/client/client.pro \
-		src/compositor/wayland_wrapper/wayland_wrapper.pri \
-		src/plugins/shellintegration/ivi-shell/ivi-shell.pro \
-		src/plugins/shellintegration/wl-shell/wl-shell.pro \
-		src/plugins/shellintegration/xdg-shell/xdg-shell.pro \
-		src/plugins/shellintegration/xdg-shell-v5/xdg-shell-v5.pro \
-		src/plugins/shellintegration/xdg-shell-v6/xdg-shell-v6.pro \
-		tests/auto/compositor/compositor/compositor.pro
-
-	use xcomposite || rm -r config.tests/xcomposite || die
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild b/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
index 03b11bd2cd79..5eb6d42b5a50 100644
--- a/dev-qt/qtwayland/qtwayland-5.14.2.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.14.2.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 3dbc2f504c69..0a906eabc8a9 100644
--- a/dev-qt/qtwebchannel/Manifest
+++ b/dev-qt/qtwebchannel/Manifest
@@ -1,7 +1,5 @@
-DIST qtwebchannel-everywhere-src-5.13.2.tar.xz 192652 BLAKE2B f028a22f0644ff8d0d037c3007b25b43e038b0c146416ed5e67f31077f6a237975cebe05c557f280d898b378eb6274b8bba44893689f0231ff6e31f057c71b5d SHA512 7d6352016eec58c5212898ada0095337a732f4c67f161b907467a297ca68ad22b1a9c507f5a7482f3c2e6fa29a0e6b4c4ad540b69146c5ea4f87671fc45dffd3
 DIST qtwebchannel-everywhere-src-5.14.1.tar.xz 202524 BLAKE2B 7b64682e7f3716f4da82f89853fa3d682a47d900e9317870d81ba0e33a3c9dfa41570294eac0eeb5f2e80e077de8747cd5c922593e9874b681cd26dbf989e2a8 SHA512 7abe214227efcea665a38488b73286ae8335490d825dd8886270e2c1cbf7382e27d6ec368b28f9876d6843029023a63e58f42e2bdb6aeb1502ae464af3e8666e
 DIST qtwebchannel-everywhere-src-5.14.2.tar.xz 202592 BLAKE2B d65dadcc93c02d1a4d8bee81371a79037054442c153cd4e24d04df1052d654204fd8bf3cb17aada35b2627ac5221b840af58e3fd7f58cda45c0a3eee97308d63 SHA512 57080c8cf7fb5c91fa6b325566d3fb2dc3c1d3bcd8128d2a40ea92f8bae7ca0f0fb4bac1d68452998a5dc06781155058d149df069fed5ff16b6d8ad43a72e002
-EBUILD qtwebchannel-5.13.2.ebuild 537 BLAKE2B 64a08dfb7277fdace6359a095612e4003e0ec057c837f5733a392395321d4b48431f8a6ce9371524a01213b95a8bd72d3ee425ee35395b4be77342e27d881a52 SHA512 956d1a913490017a462a5f9723f3a99b51576043b21d3874d1bb9627cf3f84d4026b44900d2e8a8bb448f5b2b17dfc442028bb84853bbc136aff1492e6009aec
 EBUILD qtwebchannel-5.14.1.ebuild 565 BLAKE2B d0e001b3d27b9dd3ca7bed2e8941f80600187f779b06dc0c9d79f2ea6ab5bece2dd5cea958200185a1d9c7ecc3068925fa04f14a86f138387c2af60171e2ff2f SHA512 4d4b7273172e2b3b65cda6d2b15443284c0544c170007750c2d10eabf2215707fac405263d911d34d105658264d8d3202bc19395bde232c46efcc6a2cd6db7c4
-EBUILD qtwebchannel-5.14.2.ebuild 569 BLAKE2B bb9178f2a14447d0140d04edda6b6a2dfdba9b6f049fe5df3878884242ec195f21c8854dda23303067f225cfc4970cbde6e2bf81285943cafbe6cf356f497711 SHA512 2293a80586cf32498ffaeab853e6010a8ff0a3cd2d89132912a39b1439f4f6ee576a44a9ef16de739ccdaf16af5cae9673c1553891ce77737d4f33d9596b1b71
+EBUILD qtwebchannel-5.14.2.ebuild 567 BLAKE2B ddb89203e3705dcc70b9a8f402467a22791e3ddb9a1f20fc2f77847018f8370c692b8b8b69cf5e5b71aefe069b85822ecc2c32cb3106357d501f370cfabd7918 SHA512 bd1df8af0d25cfe95f21e06ac34df9e0f0bacfc8b5666d7d06dd644ffc786d701f28330d75772f54399596588906041b748abbff2d2916676d80ab87ce814d0c
 MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
deleted file mode 100644
index 5827780c9b4d..000000000000
--- a/dev-qt/qtwebchannel/qtwebchannel-5.13.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="arm"
-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.14.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
index 6d9ff18316c6..56dfd6458323 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.14.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.14.2.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 584aef98af98..8620bd12cadb 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,10 +1,8 @@
-AUX qtwebengine-5.12.5-icu-65.patch 1394 BLAKE2B 223e449a1086c2f062e34752278ba83a828283aa577b92aa3ba28343fb06e18ed6b94990e46729076b099674e2a0936f08958aa72ac3b44f4cc7dd1602b13cfa SHA512 2b530a6a60e1ca71aba7c7d86f7e831799e8bec20ab6c97d79e753d337767c9f44938f19c00714706f2720bb4b0a3599a44046a69ed42372b21bac452b713b68
 AUX qtwebengine-5.14.1-detect-ninja-1.10.patch 938 BLAKE2B 570ec70494e8025d43aa666deb08610bb87ce493d724d844935f7af6cd59e1cc2e8967051d17d68a827abb27771cf7262eb81405ce1e429c0cd4563dfcc51209 SHA512 d9e4cac4fc13e97a3ef9e91956f76af4ea7bae7f7686e84f077c59411397b88eda7ce3184650cc3edba70af5905ffd14bfb92717e4fd9ae0957d6dff43f2f8a3
 AUX qtwebengine-5.14.1-disable-fatal-warnings.patch 463 BLAKE2B 711aea51b588c899bc45131e05cf14b3d78c8d88e75ed2531ee338cb70924f6a195bc541e3d00883951b04cca94100ef2b5c5c2c27d5d5546f8da40450c788c2 SHA512 c3c13b4e98079f566a4ac5ac3272f2643f9d2fe179922a8d4e964d604e15d8c386c7cd8e13aa960bba64a6fdd6f590e9fd34a4e824e2054a3f6ea7f7f9935f86
-DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f SHA512 10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
+AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
 DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
 DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
-EBUILD qtwebengine-5.13.2.ebuild 3068 BLAKE2B f0db7b00bddbc7f1611ceada0c920bd121c124f2d5386e667a4ba9cb817bf2e05435f279f43e3ec120759079e4bc6a92aa42d823dafc481f3fd061b800120962 SHA512 6542f71d03f9e22fed7711d22b6b89be354fd728d7e034b01b0510dd384e6dca49c913c91ac32acc475f10dd069dd290059502d0f0efa9884d2658a37bcf50e7
 EBUILD qtwebengine-5.14.1.ebuild 3398 BLAKE2B 09f99f74123804158d4077e779f7def2ae28bc2d34cd2e9d303817874e80b9e9ebe54b6d1c1d68e933f22f8a86d691339a4ab867133f812ca97a83fc2373ba06 SHA512 b713b9c5a2ac86dbbccc90cfd62d2d2b9489db91c8bfb3288f09987f23f3dae5d49d787d528a6bece0e1b50a87975ac62866024b4078587573613adf8690b1af
-EBUILD qtwebengine-5.14.2.ebuild 4368 BLAKE2B b9fc8ad1f5cb5501c3f04121d406bffd23200fbb53a4c3c04f85d4ab5d0df538ffb51a11a5f284a119c9706d7200d92009be01efa6081c49c08eba6b86edffce SHA512 8b1fb7a7996d764480eb82a928e9d2694116e1a541f1c2f3faeea5bfdaf4f68dbc3a42eea466dbbade6c351c836f9b46a53ab738745d027bed37facf6166a994
+EBUILD qtwebengine-5.14.2.ebuild 4450 BLAKE2B 87ca6b364d131eed3c6372e5532d5c4029eaf131af7e519548aa2d5debf7e4d304eafd73d94a298dc19b7e824a09c59cf3d5698fa4773af3bf1ada1be0fc863b SHA512 c949bd8122e17a85473465fa45998da14e843d45e347ad2064725135979b28dc9bf84b3d657ac96af9335ab69717734e4723311a1d1eaa28fb7c26f34d2fdce9
 MISC metadata.xml 1102 BLAKE2B 7ba2157c180e35ea470d8296d157d73f2fa565cbc8319f41f5ae533b02dc981a4d4352efb1ad94f1e298047a3b56cea097aef3ff09a19d33cf861cfb64ee9119 SHA512 d96e13fa5eddde448bce28c9373022909035f9b63e75584e7f320510f853e1c89dc9417f4280d307e29c9a7f75c89c75b5cc00c19c2d6cd6360812719dd0acc8
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
deleted file mode 100644
index d7fdaebdb664..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev <kirill.burtsev@qt.io>
-Date: Fri, 23 Aug 2019 15:09:25 +0200
-Subject: Fix compilation with system ICU
-
-ICU upstream now requires that ICU4C API macros are used with a
-trailing semicolon.
-
-- https://unicode-org.atlassian.net/browse/ICU-20601
-- https://github.com/unicode-org/icu/pull/759
-
-Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
-Fixes: QTBUG-78911
-Reviewed-by: Jimi Huotari <chiitoo@gentoo.org>
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- .../blink/renderer/core/dom/document.cc            |  2 +-
- chromium/third_party/icu/BUILD.gn                  | 28 +++++++++++++++-------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc b/chromium/third_party/blink/renderer/core/dom/document.cc
-index 920dab7c48d..43fd422393c 100644
---- a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal(
- 
-   for (unsigned i = 0; i < length;) {
-     UChar32 c;
--    U16_NEXT(characters, i, length, c)
-+    U16_NEXT(characters, i, length, c);
-     if (c == ':') {
-       if (saw_colon)
-         return ParseQualifiedNameResult(kQNMultipleColons);
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
new file mode 100644
index 000000000000..42ee5e87da26
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch
@@ -0,0 +1,169 @@
+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/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
deleted file mode 100644
index 7e5b3e377e4d..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ /dev/null
@@ -1,126 +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="arm"
-fi
-
-IUSE="alsa bindist designer jumbo-build 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/qtpositioning-${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} )
-	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.12.5-icu-65.patch" )
-
-src_prepare() {
-	if ! use jumbo-build; then
-		sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
-			src/core/config/common.pri || die
-	fi
-
-	# bug 620444 - ensure local headers are used
-	find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
-
-	qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
-	qt_use_disable_config pulseaudio webengine-pulseaudio src/core/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=(
-		--
-		-opus
-		-printing-and-pdf
-		-webp
-		$(usex alsa '-alsa' '')
-		$(usex bindist '' '-proprietary-codecs')
-		$(usex pulseaudio '-pulseaudio' '')
-		$(usex system-ffmpeg '-ffmpeg' '')
-		$(usex system-icu '-webengine-icu' '')
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-
-	# bug 601472
-	if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
-		die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-	fi
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index 029e99a265a7..78e614ce1235 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -78,7 +78,10 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" ) # bug 695446
+PATCHES=(
+	"${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
+	"${FILESDIR}/${PN}-5.14.2-icu67.patch"
+)
 
 src_prepare() {
 	if ! use jumbo-build; then
@@ -91,7 +94,8 @@ src_prepare() {
 		-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/include |' || die
+	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.
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index 5025609a1241..8c987d494905 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,7 +1,5 @@
-DIST qtwebsockets-everywhere-src-5.13.2.tar.xz 244668 BLAKE2B a8a0b6327673e8746939e903814adb7194f61eae6954d96bdf25dfe93e15ea7853c4605bef77ba28205afffb1048f11c3b80f6818663681e12cfb1adc064ff2a SHA512 c4d3b31e8110b74485e7fb1d6d82039efe176e8b626209485fbe3843f7a4b9f11708c9b978623d45e45263e6ae9990e927a3f7a9a48ced4dbcb5e954c60f593d
 DIST qtwebsockets-everywhere-src-5.14.1.tar.xz 252616 BLAKE2B 94fa6ee635760f3e09c771731ecbb464f25a66bf836d08afe6d206d1b4cd26a90b8b80bef18e62e105e550f409192c4b9e75c02b3b1810d3993b795000548378 SHA512 ce8926f0c8022182504184141c64897c5c71e430d6366b1d0802247e81445934db419ff61625b046b624de7b459c74f9634ae2a13e2d646a1b1811c4dbe177eb
 DIST qtwebsockets-everywhere-src-5.14.2.tar.xz 252820 BLAKE2B a2c14205fbc7f2bb3d7de1d4dff18557e027cb0d114285aa2cd7558fac63da628d7a8b1772b738194983e77bf108e097c29fe2ec02ace85a188674248bb61ade SHA512 091e17459a8a255fccece092399ac32994307aa53e6e72e736e6ff9f1bb745c49bfcb9a747e1e21acaa0ed95754f7f450ba2f73a3bbafad54e21bf600f7da92f
-EBUILD qtwebsockets-5.13.2.ebuild 498 BLAKE2B 53b040270526ed01b6c04f289baf0bbd46cc55267c83967a6667c0a65ac720429a4e8c85f862c98d16f8aeb1d6760440c3bc27c94adf0eee69717a89c1de93c5 SHA512 e7af8bb709d0c8521c4d7379de299276227f94db1c3c3aa8c8195f0729a430f85228ef412910fec08c948dbb423e81c44cdf11dba1bb9d66a047260aedf317cd
 EBUILD qtwebsockets-5.14.1.ebuild 539 BLAKE2B e21d1b897ed253ace843c9768e990358cdff83881bf9678cd052f3c9024331dc2480db50f1124d5c4f070b70691020632e9efbac6c54f0a95fc95fc7254e6cc4 SHA512 13b6fe3ddd201f1e6654c121935eb0e45f2a8e1f9eefb34219a3d60e6d470c209c772749ce53f2a68e9581c0a1f14b6427af5e27a58167a9dd7a703366b068eb
-EBUILD qtwebsockets-5.14.2.ebuild 543 BLAKE2B 81ee48cda5fa05343a359d6458e2209496f2e180533db2c4947118d66bdff6dd281ccbf2383ea2176c1b3829bd0c07f1ae0b95e50c4813123c3e23c47614428a SHA512 ed527ddf617aa7def7f2eb8793b56a83627c0a034993b767c0358835ca4b7dda3aeef5ffa483131f69279448893615873ad9768d2bfd8fb5c973ee9bfc22b473
+EBUILD qtwebsockets-5.14.2.ebuild 541 BLAKE2B 931162e06f28a8a8478df197d766302db9c24661ad44c32785879cd54d2ac5ba58a79a7be51bfe9d71b72ed2e7e7f942f93e9a591ef7aaed7511988ef23acaf3 SHA512 431f9b72e4b35b40d7bcd73dfa924857ed2a8ec087632cd54901f684581d88885657afbf5fb8f2ff222dd31c2974b5d2e2ed2cf0a8dd219f3b7a8ffa81939486
 MISC metadata.xml 541 BLAKE2B 174c4df2234a97324e1a7f1e0181f60a4ce29133c901bd0eb252c57441faf4a808ce9613a3ece13a036b6950bdddb48e915c7e2431531b2c488d8cd017bc55fd SHA512 99744f9c24fdd46617704ad0c0b8bd5fc694a1c8e6d668044edab244e4edf8f2fa73b769a7a789c539848e80e39ca3e38c88284b0ff1e3faf52450082d0c7d6b
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
deleted file mode 100644
index a6dbb84374e9..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.13.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="arm"
-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.14.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
index bb21ea253730..984c946bd80a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.14.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.14.2.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/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 9f4410c21483..f3cf29822767 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtwidgets-5.13.2-r1.ebuild 1006 BLAKE2B d34843531e4c93e02a155f59e7761a57b4f6ebab6de7016f535069ede742b11deb521f3b011aa6b47fe1345a20176d10785265e0743292c6fd2ba377e8a3c5f5 SHA512 0cea2656e06802d1a6709485c13ec42b2a4b32eefd93d022390afd6b38e711af9381509ebaced15a2c37b0356276ffad1faff66277e0f42932830dd85a606d55
 EBUILD qtwidgets-5.14.1-r1.ebuild 1039 BLAKE2B 714f6d303c4f87e2ca3b265de66beba491691ffdc7367bc624109baf8e2c424b35c8d6a38a0ad9a1de827376b6abd720c00ed606f6c454e545150269e1775a48 SHA512 854c6e5c399d921e30485de86f86e8d654cd6ddefa6808f085d39a08b925bc818e0114dcd7c38fbd4b3a36ec9da4e23b0908770c07d69e5a013ba3a693ef166c
-EBUILD qtwidgets-5.14.2.ebuild 1047 BLAKE2B 14d8eea560a3e59880f6cf26be68b8b998e98b5736ab029f5ba19ed9e8ea84d70f32f5ec7bc59513caabbf1ebf1062e5298c1255dcf4311375ad7e054c6ded2f SHA512 845222cd336cf00009a003f914c4cb06a34eb2954b2d3950597132d65fa7825b9959c115eeb582f1a173e1f7472ac10c2724f599a589d48366bc29997b91fde1
+EBUILD qtwidgets-5.14.2.ebuild 1045 BLAKE2B b22656442e966e717f56195976b419f878da1cf397d3392f41afd4d24d55b70fdcbde48c1ca13a55bea27bcb6aea2fbff8596b7f140e8c0779c966811f5eb338 SHA512 1a094741fd424a0e5a0e6cff49ef4ed8391680304b6efd0c5819895a2da650e28b242770c57bffeb3d93f87c400d17ec02926358cf6c5d3af97b387a196532f2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
deleted file mode 100644
index 7df5bdeef388..000000000000
--- a/dev-qt/qtwidgets/qtwidgets-5.13.2-r1.ebuild
+++ /dev/null
@@ -1,56 +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="arm"
-fi
-
-# keep IUSE defaults in sync with qtgui
-IUSE="gles2-only gtk +png +xcb"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2-only=,png=,xcb?]
-	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 xcb xcb system)
-		$(usex xcb '-xcb-xlib -xcb-xinput -xkb -xkbcommon' '')
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
index 26bc4f95f022..b8ce2ba581db 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.14.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.14.2.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 9525e64e2c67..d28745493600 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,7 +1,5 @@
-DIST qtx11extras-everywhere-src-5.13.2.tar.xz 127228 BLAKE2B e1b12f784d657802291419c61646078548e7c4a688b39686b7159d97a281b38e8a05f4a58569ec0abb5bf6f1b5ea5e0221d1c491f23c9c636d3427772074d824 SHA512 229dfffcc6da5cae80412f099c0e1fcdc4d2e13371020cecd1f7dc100475d5ea300a2b4b4da8e3688fdf6a82e371b6feab4f70a171e72a8f56467c7d16f60d7d
 DIST qtx11extras-everywhere-src-5.14.1.tar.xz 135740 BLAKE2B 37402260c79b06c1d83f2b4f3be1374e392ed89444d905b21baa4d4ebbc258cb6f76bce82ef0a29dbc702e238177cd65640af2a096256888b29c8ddc36e2ff4c SHA512 e88c9e0440c5d12003d74182dab5e63f0c65ced93447b5c3cabccd1c8c96e9b8e38fce327e678a433af18d2af683bb4f939dbc3e7bea2e911eeeb71ebe70c058
 DIST qtx11extras-everywhere-src-5.14.2.tar.xz 135712 BLAKE2B 83890aab605bdfaacdddbc7a1893bd570a15f4135bfd924ca923570b3d12042b916f493426b1945319afd60e651f51ad49b3575b69b07ed4264a8a6cd7005a49 SHA512 cf30e66fda18b9bfd266b41f15713f7ca7390bc533fb8093096853f1554c2a91eb065dc17acb5b355b8fad08df3c695289d8c8081d568061c99659ec35d79b14
-EBUILD qtx11extras-5.13.2.ebuild 392 BLAKE2B 08b9e461cc2e4b2d34b39d132d25b8e0a1c7b4cafebfb95513b5717fc073c3fa01a175182075d14fa098ac17aee1e8fa2538f906473e61da4744f9567b3f326b SHA512 703b0d9d01dd4289338c847583863ecd987f1f8ef112a3467f2866957108c3bd9439276b441e7ffbfa9fc47c498e814a8b44a77ef836753e392226c2bd035104
 EBUILD qtx11extras-5.14.1.ebuild 431 BLAKE2B e09a0cdfebd7148f0bb56e67f67729423bbf2d5a24f7e5df75a33437fc8f4da22fac66e94cfa73513a710233e25350edb8c9300556c741add4f458b84759e249 SHA512 810abab64174946a6c13502d6858d1c2e63f27afa2c1a33ae64dfce124d323630e5eb8591fc6f2ca2921b57f8dec4b554989b0f7386e78322c8c7d8cbe8c9b9a
-EBUILD qtx11extras-5.14.2.ebuild 436 BLAKE2B 4be61843a21d0e6986416682d3613c76c8953ee3946fc435c1af771af2bb9a62c9191dabff85bd88edafc81d5029b18f1f8a5b38bc7cefe85f0b42191f5180bc SHA512 6bd6c59c8b68d98a3ee9d4c5fe2816def7c01bc72348a6cf5e7c99d70a46ef0b6b84acc5f478d04dd8863cc5b4222651b204b42aadaa1169d2ba81f5cf7300df
+EBUILD qtx11extras-5.14.2.ebuild 434 BLAKE2B 30bfb16d86f7705e9c818b298ae73f2786c66536be7f1bbb20388822c7d3c11d28aaf4d6f82138cd9ac6c98844d5ce0d2b257fbd600c5c1d679ff999f26a7372 SHA512 fad504e111d87972ff31609c1629e8bdd374111b1557cfe6da9eb6ddcb5e8cdcea2a811b3d78b437326c04c89ab376aa9484ac92a9f22c7b36e733baa6eafb59
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild
deleted file mode 100644
index 3dfc49ae8862..000000000000
--- a/dev-qt/qtx11extras/qtx11extras-5.13.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="Linux/X11-specific support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="arm"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[xcb]
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtwidgets-${PV} )
-"
diff --git a/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild
index 32aefe9b955d..c16ea4c3576e 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.14.2.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.14.2.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 3ca1e80528f5..e14480a46c67 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,7 +1,5 @@
-DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 BLAKE2B 50b8d69212602427b76dce6efefb9195e91e4bf5a09b732e564b66a4e27cfaf193fd860139b2c4cc774b0b1132af1426b79e381fb42eafd506239096bd87837e SHA512 b00ad017cc95876698615fd6e41c6ade366146c1f7057e1925bc1b72918f091aa39aa6bf0ea450fc6cd4d8f9810b228770d981dcb6cbe8ad30abb2c42804a204
 DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 BLAKE2B d5641df96a90ec4f3f85e47444c151b2090161330df9684703883865ddc84bed507295b67953c0a8cad9c104a10727ac9fb26d7f3ec4bf2052294c843f108491 SHA512 964777323d0e3f9d355218c3493bb3b61d2750d9cb5ba71fce72cae3cd362acce88e39360f1fac0011f1b74d529a23621a7281191c622cc034ce78a77afa296b
 DIST qtbase-everywhere-src-5.14.2.tar.xz 49865752 BLAKE2B ed8eb18dfc79e9983248655eb62e8305ef8b79f96c7880c88533250fef8f0d187cf576082d41df08314711b4c007b94686486abd77bf9bc201336caa02ced300 SHA512 8c83e06d58b56e9f288e83d6c3dd4ad6cc9f1eb1a32c7b44fb912fda34ed7255766fd9fa60cd740ee001df7d6172f25df05f1f95e986c3e793fbcd9bf4f18de9
-EBUILD qtxml-5.13.2.ebuild 451 BLAKE2B 50220e210d68f7eece22d25d711d93996774260a428f97e1fc25c793cbb5dcfe754b3293dfb2d836dd747227bf3899a0e409f089c345ed846473d041eeb87603 SHA512 c0c2cb1d056c873fb1ee53126ba4d48cbfd7f721d5cde0113cb1c1fd8a5f8107624908db1b225b2f3266c10106a90b682d8eca212a74116415523f0d118b87a7
 EBUILD qtxml-5.14.1.ebuild 491 BLAKE2B 278754d88d85f463ce23410a1d2f8853cf996369a85cc7305bbb87b405af971bb91ec608ce2303ba8177a984d39f242a330f99d7fd26aaca451482c8195c0428 SHA512 f910bc5027d505eeb50a4b2124532c4a409a4f458becf2684d48a8f5607683c3b7c3ed81b8ef528bcd959200be0559cb306c84e8bb74a989284cb1042ddaa88f
-EBUILD qtxml-5.14.2.ebuild 499 BLAKE2B ce015661de5f79c2bc6e2cb3b53847e842a13c2b4be275bbbb360572870df66c38caf398122e3196ecff8fb23fe7e3cad9af80debba17e0cbe2e44010d7dd691 SHA512 7b4ad9d7f67ed3601ca133239518966781f674cf443e3ca8bb568c74178c60cc5a630c7a07af452d12e917b864ebe4bd86a82dc64283d72b3557d723f6703038
+EBUILD qtxml-5.14.2.ebuild 497 BLAKE2B 69390ec90565775c26d50c8ee9cae8a633ee99275c33cf62f33a627c8149055310b4f5f8136badedf0946a4919d6acf3c51754821e36f1bf61a82a12e544ff26 SHA512 f18341effc62dc080287b2cf1679bb929bea2d2a0f50b88e677e5b03e497a3e9eb9f527dd5625726e6b8104649ece4e657eb58d47fd78b95eef64b4d15ff2bb2
 MISC metadata.xml 481 BLAKE2B 210b94f2e7cdb09b2e07ec4a931ea47d5aed734be52e9dcb132ae174fc0707ebd82feff52e44490c7133274c4dd31b0898f9fa54ce700b635b6a45c2cbf2b5c6 SHA512 bc22732d392630b21ba3895b22a3b1835fe639f930bad0ebab511757df89ebbb30530f0c482ff0a7eb24c7ba844f0b2448040dc5252ac98b0ac01423f236829f
diff --git a/dev-qt/qtxml/qtxml-5.13.2.ebuild b/dev-qt/qtxml/qtxml-5.13.2.ebuild
deleted file mode 100644
index 3637e388d74d..000000000000
--- a/dev-qt/qtxml/qtxml-5.13.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="arm"
-fi
-
-IUSE=""
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-"
-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.14.2.ebuild b/dev-qt/qtxml/qtxml-5.14.2.ebuild
index c475c1b3f0d3..01508525dc79 100644
--- a/dev-qt/qtxml/qtxml-5.14.2.ebuild
+++ b/dev-qt/qtxml/qtxml-5.14.2.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 d497fe98f728..c3c39fa6a090 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -1,7 +1,5 @@
-DIST qtxmlpatterns-everywhere-src-5.13.2.tar.xz 1392192 BLAKE2B 4c0ef609a93548e1ec0c6371ed01fa1ba761d1b94e168d016da3c09447680fb4080db3e1ee2a0d6fd51f9c07ebd2fbf7de5f2f1c651dc258afa25f2b3dcc570b SHA512 ee783ec9429d393b165ce4947dd28cc92f018922862daacdbe2258bf4a23b64f2d30e0b781620061bb8063db5b16bf5e79b09c3174436e0bad04821bef305076
 DIST qtxmlpatterns-everywhere-src-5.14.1.tar.xz 1403600 BLAKE2B c0a4f0ebcef74faf196a51bd7e36c4c8a09b1444f2d5460d6fd96ce00b80a37fede9e62848e9bd6701c2b24890108a50faf4340091680972ebcba7c9594f1436 SHA512 01a1e1af16c37cda8de23ed8da7f42f8f59116a3c7ff35fed4c589ab41f32c9e4ee3ef782517538e7d85ed86ad42bf5cf729bee9c239e4a1d7bf30458403a4ed
 DIST qtxmlpatterns-everywhere-src-5.14.2.tar.xz 1404028 BLAKE2B aff0d2aa2396418c2b987f1485d3753546c09de8d5eb06efab52d635e95f8e056def8a4b6927d8d8f24c3af264cf762e64a2b3fa9d318671df4ea0f0f3f5bf0a SHA512 27f674c4811b010ec461c54ee258b1d6b58dcb5c11795621b7bbad9fa2c19c1b6b62286cbe8895151261129c7d6d91007c3a8be6cf64af1f4cb32e2e9976ac23
-EBUILD qtxmlpatterns-5.13.2.ebuild 581 BLAKE2B c476fbce66876ffdf0c7b5eb31c306e2c8c75957ac50fe26a963272928929e67eae8da50aacf243ffa156125ae724c1e459d854f84a58d1f7bf919a8a49d922c SHA512 8972b1479d013398fe45f800add3373f20fc5716b70d81ff40f3a9138c4db662e51cac2338025ec380dd9ec6e475206111d13f45071307e096f224c6f08c9779
 EBUILD qtxmlpatterns-5.14.1.ebuild 621 BLAKE2B dfab89350e8e546834b0e86cbb2e3c4cf7dd1969c526aefb734a87f7f989ed65e1b45b7449bef853b1a21ed21fd2819e0eff8d18e9f37ae3855741261cb8e93f SHA512 20c4b5cd3c397be560069b77b9f185b010b68f1373a95ea0ddfde2cf6e47ff417bd0cf626d0f46f4b562920e1c29e48bbbdac78af816ec12a50af9ac2395d001
-EBUILD qtxmlpatterns-5.14.2.ebuild 626 BLAKE2B 72d955fa0935cf43842e8db6f2ed6b801f9c28bfb81b49f8ac0301c91cb667bcfbfc22cbdc356a98458fb368310187f841d0a713002e41206c7c62fca5cdf092 SHA512 6d1fabf23e5da30d77556500067eb35ee7be575970b97af1b49cdb8be431a5398a48b794bcb35f9d4902f1c59da8ff4c066445515470605819e4927932a0113a
+EBUILD qtxmlpatterns-5.14.2.ebuild 624 BLAKE2B 20b4c342c68d489cfd4aa91a36dcc97602cc3e0fe6c8ca8b32b50c7d2c317f1640a1d46a987653d2cd2d14938ef1e0c85a5f7e2d28d940bb3d766b3eb15fcae7 SHA512 e05561b5481d64d10ff2ab791ab6a85880209c8291c6c9c1e246dbb2683e80037a4eb6c755b22fcbe592bea12590397a86a48040854232bf074b3580ecc2c17f
 MISC metadata.xml 589 BLAKE2B bbca816148efdf3a04c05ea1c653a4e9a6e7c9c8109283719d53a06188e495df1addfceca8acc374ed03b89391fe14c70eb6e84b4f5343fb7345e841d50d8ee0 SHA512 dfd095f116f9223cea460984b650cf9d6f506f1bc5e43ae38429528d1218863d785fb47e05a3c9eb4891838d58baa967de3ac31d59e38c4de90a5655c8344d4b
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild
deleted file mode 100644
index 4c67c496e6b4..000000000000
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.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="arm"
-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.14.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
index 66fa234d35c7..a0c99aca8206 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.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-05-14 11:09:11 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-05-14 11:09:11 +0100
commit	deba8115d2c2af26df42966b91ef04ff4dd79cde (patch)
tree	9a48f42594e1a9e6b2020d5535a784314434d7a7 /dev-qt
parent	38423c67c8a23f6a1bc42038193182e2da3116eb (diff)