dev-qt: Security cleanup Qt 5.13.2 all KEYWORDS except for arm/~arm

Drop all packages ending up without KEYWORDS.

Bug: https://bugs.gentoo.org/699328
Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

64 files changed, 56 insertions, 339 deletions

diff --git a/dev-qt/assistant/assistant-5.13.2.ebuild b/dev-qt/assistant/assistant-5.13.2.ebuild
index 101ef370f0aa..5faa15820d4f 100644
--- a/dev-qt/assistant/assistant-5.13.2.ebuild
+++ b/dev-qt/assistant/assistant-5.13.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=7
@@ -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="~arm"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.13.2.ebuild b/dev-qt/designer/designer-5.13.2.ebuild
index 42cf86b95c1e..f70d3ad7a151 100644
--- a/dev-qt/designer/designer-5.13.2.ebuild
+++ b/dev-qt/designer/designer-5.13.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="arm"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild b/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
index 04d36b50295a..9221737f1a06 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.13.2.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.13.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="arm"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.13.2.ebuild b/dev-qt/linguist/linguist-5.13.2.ebuild
index 2163d82be9b0..97cd2b010e81 100644
--- a/dev-qt/linguist/linguist-5.13.2.ebuild
+++ b/dev-qt/linguist/linguist-5.13.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=7
@@ -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="~arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.13.2.ebuild b/dev-qt/pixeltool/pixeltool-5.13.2.ebuild
index d6b6997fe0c2..d5e0a358361a 100644
--- a/dev-qt/pixeltool/pixeltool-5.13.2.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.13.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=7
@@ -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="~arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.13.2.ebuild b/dev-qt/qdbus/qdbus-5.13.2.ebuild
index 906f1b9981e5..2ff37430f489 100644
--- a/dev-qt/qdbus/qdbus-5.13.2.ebuild
+++ b/dev-qt/qdbus/qdbus-5.13.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="~arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild
index 8bbeb79dece5..95aee18f89df 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.13.2.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.13.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=7
@@ -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="~arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/qdoc-5.13.2.ebuild b/dev-qt/qdoc/qdoc-5.13.2.ebuild
index 06860e804591..125cde124885 100644
--- a/dev-qt/qdoc/qdoc-5.13.2.ebuild
+++ b/dev-qt/qdoc/qdoc-5.13.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=7
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+	KEYWORDS="~arm"
 fi
 
 IUSE="qml"
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
index 183df3622c70..166c2fa7b517 100644
--- a/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.13.2_p201910220817.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
@@ -54,7 +54,7 @@ HOMEPAGE="https://doc.qt.io/"
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~arm"
 
 IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
 REQUIRED_USE="|| ( html qch )"
diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest
index ebf419c0bd3d..9646b7c857a6 100644
--- a/dev-qt/qt3d/Manifest
+++ b/dev-qt/qt3d/Manifest
@@ -1,2 +1 @@
-DIST qt3d-everywhere-src-5.13.2.tar.xz 81537856 BLAKE2B 17e0b73467a3a0bda9436fe594ea970d2512b93eef171913f403e3af238dc23564c9cce31c1f70688e9b453fb67d24201f6915368812172fa6efdddf0b3aa041 SHA512 54bf998ee378301fa7c6e236366518266e1cb23acfecd1015658ed5e7f40f4c9c4b5ad23c96b525867f9f7d2c2d983c059f88d045314dccc2e2501e1eec37e5f
 DIST qt3d-everywhere-src-5.14.1.tar.xz 81561704 BLAKE2B 6c68a27f16c148ba6a1a80ba044fc928187df3462224060d5b2a4ce9a083521a900703c5c80327c8080cb3a41a63d84f6b7e12b4b44763fe1b1c4811f18c76f4 SHA512 ba5027a468059f482e87838d134b5f0385d14b7a4daca01671119b182955178b9c919b22e04e2d9d66f978aa3ed774ef6655636033e32949cdb9542cd44338b9
diff --git a/dev-qt/qt3d/qt3d-5.13.2.ebuild b/dev-qt/qt3d/qt3d-5.13.2.ebuild
deleted file mode 100644
index 499aea900e53..000000000000
--- a/dev-qt/qt3d/qt3d-5.13.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D rendering module for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~x86"
-fi
-
-# TODO: tools
-IUSE="gamepad gles2 qml"
-
-DEPEND="
-	~dev-qt/qtconcurrent-${PV}
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtnetwork-${PV}
-	>=media-libs/assimp-4.0.0
-	gamepad? ( ~dev-qt/qtgamepad-${PV} )
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	rm -r src/3rdparty/assimp/{code,contrib,include} || die
-
-	qt_use_disable_mod gamepad gamepad src/input/frontend/frontend.pri
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
index fdac527647cf..1160a5f5d385 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.13.2.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.13.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="arm"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest
index c48794da2214..a5edadd753b5 100644
--- a/dev-qt/qtcharts/Manifest
+++ b/dev-qt/qtcharts/Manifest
@@ -1,2 +1 @@
-DIST qtcharts-everywhere-src-5.13.2.tar.xz 4244092 BLAKE2B 460716cfb39dfd248c16cda8e73e90a83c1e8f02c67f7f1cfe6f8a03dfb8b52e2d1001381713d3cddfa4c4c05f7e3d44d226b61b2e6f1f9133409c3eed89c192 SHA512 a49e0fa92366f03c35dc8b69e7c2fb02f52509ebd81000ff7174567dfa2a7385cbd5bd260d356e879539ab47a2263bb156e5753c9eca5d2230caf562349ed2e5
 DIST qtcharts-everywhere-src-5.14.1.tar.xz 4250588 BLAKE2B cc3c01385c09a04c8999d2a658ca8b13231fb0f99867afb8ea343e8ff66815c6980751ec076468ca394faedfc5f8f05e0c99739b19ac6a7c9cf5b01d0fb8b8c8 SHA512 5cf2739a5bc67ed25cb6f39bd795447c1e37963d1f3726d37ad9a2894080db3329fd2c6b17937ad831db78f5099e7c3b4ecd02991a7a69eb482ab61877d54d0f
diff --git a/dev-qt/qtcharts/qtcharts-5.13.2.ebuild b/dev-qt/qtcharts/qtcharts-5.13.2.ebuild
deleted file mode 100644
index 44f40be187e9..000000000000
--- a/dev-qt/qtcharts/qtcharts-5.13.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Chart component library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwidgets-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
index 48681faaae0d..3a3f3d4cb8bf 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.13.2.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
index 1518e46b3370..97af29b9ec1d 100644
--- a/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.13.2-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+	KEYWORDS="arm"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index f1941f0aaeb7..029ba6fdb878 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,2 +1 @@
-DIST qtdatavis3d-everywhere-src-5.13.2.tar.xz 5182216 BLAKE2B 712cb724c175dcc9540dee71321fe8906514c07b1b81ad343bf64fc090baaec79a08f553a9027bd9537cf5c59bf255055d0c05d127632859b9573c5efd04dba3 SHA512 57d934282f1a0a73201ef25090eb82dd0d00317bf8b3aac55e841cd30c256c38097f5cf16b2cdf79c4f4bc42e9d40351eea1c7b2a28701b117fad394ff094dfd
 DIST qtdatavis3d-everywhere-src-5.14.1.tar.xz 5190456 BLAKE2B 823ff1db1dadc47f866c88feab042180598f3089761a80aed2bb8d13912326b972594af955bda0e77af8b0c1b4f337282c3aa447ef5bc8d38d28a85362faadae SHA512 51ca881a89bbe88011d4386edda23d42932e991d57586687dd022febe4cbfce9ff863f198e2d3b106f081c2bd8765f4c9de56b5db0a0a4a3304b464800a379d7
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild
deleted file mode 100644
index 78d134ab2c34..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~x86"
-fi
-
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtdbus/qtdbus-5.13.2.ebuild b/dev-qt/qtdbus/qtdbus-5.13.2.ebuild
index 9e5b7220b6ff..a057a8edefd4 100644
--- a/dev-qt/qtdbus/qtdbus-5.13.2.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
index 3662b3d4ce88..73819b7074b3 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.13.2-r1.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 ~x86"
+	KEYWORDS="arm"
 fi
 
 IUSE="gles2 +jit localstorage +widgets"
diff --git a/dev-qt/qtdiag/qtdiag-5.13.2.ebuild b/dev-qt/qtdiag/qtdiag-5.13.2.ebuild
index 11ddd15e1ab9..d66741ba7111 100644
--- a/dev-qt/qtdiag/qtdiag-5.13.2.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.13.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=7
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
+	KEYWORDS="~arm"
 fi
 
 IUSE="+network +widgets"
diff --git a/dev-qt/qtgamepad/Manifest b/dev-qt/qtgamepad/Manifest
index c98ab403854f..571c1e0ad88c 100644
--- a/dev-qt/qtgamepad/Manifest
+++ b/dev-qt/qtgamepad/Manifest
@@ -1,2 +1 @@
-DIST qtgamepad-everywhere-src-5.13.2.tar.xz 386668 BLAKE2B 5b4db9cd9b371c9fc23780fad31f0164569a3b41540c4d963df476426fb46a79e1ffa2e1bce86bdb85236a8d5143fa92996bbf104b15c140e84842838da35674 SHA512 5145daa5a332050cc99765e0c2e200cfcc2b1578a40dee54678bee1f52acb867e48e354068958c0e13a977cd2691b24aa9695a53d48d2ea444fb3c4e450fa95a
 DIST qtgamepad-everywhere-src-5.14.1.tar.xz 386892 BLAKE2B 2d50180001529278c72dabeb581f9fadbe87bfd55eb4380c5c345e327531580d78be8b65e6ce4a9a92efcceb370a14bcf36ae2eaa0e9efa5039a65a80a8e2d97 SHA512 d3c84f85cd47cd0a8117820d425c524c04a84262e052d4646de611c61e29a74d5b3a27418b9f5b2cffa06fc30a3f5d7c57a7af80e68b30f01945140d0caa16da
diff --git a/dev-qt/qtgamepad/qtgamepad-5.13.2.ebuild b/dev-qt/qtgamepad/qtgamepad-5.13.2.ebuild
deleted file mode 100644
index 7e3762dc4f11..000000000000
--- a/dev-qt/qtgamepad/qtgamepad-5.13.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module to support gamepad hardware"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~x86"
-fi
-
-IUSE="evdev qml sdl"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[evdev?]
-	evdev? ( virtual/libudev:= )
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-	sdl? ( media-libs/libsdl )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt_use_disable_config evdev evdev \
-		src/plugins/gamepads/gamepads.pro
-
-	qt_use_disable_config sdl sdl2 \
-		src/plugins/gamepads/gamepads.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild
index db46772b4ddb..c330dfbfa970 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.2.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.13.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="~arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtgui/qtgui-5.13.2.ebuild b/dev-qt/qtgui/qtgui-5.13.2.ebuild
index 291c505bf4c8..ec493f247cbc 100644
--- a/dev-qt/qtgui/qtgui-5.13.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
+	KEYWORDS="arm"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qthelp/qthelp-5.13.2.ebuild b/dev-qt/qthelp/qthelp-5.13.2.ebuild
index fab7e1f2d25d..e859fdce9a22 100644
--- a/dev-qt/qthelp/qthelp-5.13.2.ebuild
+++ b/dev-qt/qthelp/qthelp-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
index bee26a5b8224..5527a38493cf 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.13.2.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.13.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=7
@@ -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="~arm"
 fi
 
 IUSE="mng"
diff --git a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild b/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
index 6258747f51ae..a373712510ce 100644
--- a/dev-qt/qtlocation/qtlocation-5.13.2.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
index 9c5866b6b7f8..d5a2f4d166be 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.13.2-r1.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="arm"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
index a8a5da57db9d..4b97e02f2233 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.13.2.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.13.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="arm"
 fi
 
 IUSE="bindist connman libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest
index 4a4642994ad6..68b57932d879 100644
--- a/dev-qt/qtnetworkauth/Manifest
+++ b/dev-qt/qtnetworkauth/Manifest
@@ -1,2 +1 @@
-DIST qtnetworkauth-everywhere-src-5.13.2.tar.xz 141172 BLAKE2B 23c6ed981b57d0028e33a81cfd3f060435d29f5951c3e7b6cf2a1f609a475ec2285e2613c7a4abbe52af44b0a0d6979f277a3da2dc550cd442b5a467fe265ead SHA512 1d0ba90f6b70a840ceeecd72caa8b128e6277e49e520d908efbd43b20bbe3a0e955d9b88f59327268134f32b18bb7b9cb0b9b93e34a43f9c38617338c3566d4f
 DIST qtnetworkauth-everywhere-src-5.14.1.tar.xz 141432 BLAKE2B 0054892ea52c204d60d343d8a362249785b48a8fe2708008e0268f7767f0b1f0580100bebfa3b033c5c103a9d46952ca001e056dd24d7d12b885d15ad5e33508 SHA512 ff6858493012faf83b4f82839807c640881575ede6ec133db91704590a9d977d3e2294632caca5a672f1326a8e38fb527b6c4c54b83a5853db6b4085cf5a109e
diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.13.2.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.13.2.ebuild
deleted file mode 100644
index c51a4f715b7d..000000000000
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.13.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Network authorization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtopengl/qtopengl-5.13.2.ebuild b/dev-qt/qtopengl/qtopengl-5.13.2.ebuild
index f59ec02d52d3..739705cfc875 100644
--- a/dev-qt/qtopengl/qtopengl-5.13.2.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.13.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="arm"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtpaths/qtpaths-5.13.2.ebuild b/dev-qt/qtpaths/qtpaths-5.13.2.ebuild
index 37178e0df2ae..ee1ce79389ed 100644
--- a/dev-qt/qtpaths/qtpaths-5.13.2.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.13.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="~arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtplugininfo/Manifest b/dev-qt/qtplugininfo/Manifest
index 66f957dfd85f..42e58fa10599 100644
--- a/dev-qt/qtplugininfo/Manifest
+++ b/dev-qt/qtplugininfo/Manifest
@@ -1,2 +1 @@
-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
diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.13.2.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.13.2.ebuild
deleted file mode 100644
index 85a22f1729a1..000000000000
--- a/dev-qt/qtplugininfo/qtplugininfo-5.13.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-QT5_MODULE="qttools"
-inherit qt5-build
-
-DESCRIPTION="Qt5 plugin metadata dumper"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/qtplugininfo
-)
diff --git a/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild b/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild
index 2f2482d52d80..794f37d118ea 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.13.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.13.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="arm"
 fi
 
 IUSE="geoclue +qml"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild
index fa1154995401..7db12e75799f 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.13.2-r1.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="arm"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.13.2.ebuild
deleted file mode 100644
index 42ff7bd6b26f..000000000000
--- a/dev-qt/qtprintsupport/qtprintsupport-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
-QT5_MODULE="qtbase"
-VIRTUALX_REQUIRED="test"
-inherit qt5-build
-
-DESCRIPTION="Printing support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86"
-fi
-
-IUSE="cups gles2"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtwidgets-${PV}[gles2=]
-	cups? ( >=net-print/cups-1.4 )
-"
-DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV} )
-"
-
-QT5_TARGET_SUBDIRS=(
-	src/printsupport
-	src/plugins/printsupport
-)
-
-QT5_GENTOO_CONFIG=(
-	cups
-)
-
-src_configure() {
-	local myconf=(
-		$(qt_use cups)
-		-opengl $(usex gles2 es2 desktop)
-	)
-	qt5-build_src_configure
-}
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild
index 96b9f35c2c5a..8b042de79a56 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.13.2.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.13.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="~arm"
 fi
 
 IUSE="+widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild
index 84ae70d7d229..6bb3adff4bc0 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.2.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.13.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=7
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="~arm"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtscript/qtscript-5.13.2.ebuild b/dev-qt/qtscript/qtscript-5.13.2.ebuild
index 9f19eea4e5ec..10e70383dba3 100644
--- a/dev-qt/qtscript/qtscript-5.13.2.ebuild
+++ b/dev-qt/qtscript/qtscript-5.13.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="~arm"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest
index d6c0402b9c39..349c3583d248 100644
--- a/dev-qt/qtscxml/Manifest
+++ b/dev-qt/qtscxml/Manifest
@@ -1,2 +1 @@
-DIST qtscxml-everywhere-src-5.13.2.tar.xz 435428 BLAKE2B d8989c345b1877329c485347f8f953dc07c502baadce916111b2f25cd48e8a60db4ee9b5de379d17662f520b66bf55b5c11f8132386250353b5c7aaf1f258199 SHA512 d1dd4752983c35bb899882197098579ad7221039369f550290e1044fed6aa68f4da5d0c9969980ca3a63180d5d3e5f3ac208723ad80e8b71cd84cd86312ab453
 DIST qtscxml-everywhere-src-5.14.1.tar.xz 433256 BLAKE2B 539b064f74527f87bffca266c4a1d6c26b031f0370e0af2ebadad46d0335b0d341cca9398105b929effb026fb93b77f2c368f025627fb81cdbc9b08b28d4f905 SHA512 92facdc089f7d8c5521617d3080964a12df26e8b34c194be3c9307b412606548d8fda66d401fc6d93f71fed7f1bc7d075f797d4ab27de0ff603608d9b5601c25
diff --git a/dev-qt/qtscxml/qtscxml-5.13.2.ebuild b/dev-qt/qtscxml/qtscxml-5.13.2.ebuild
deleted file mode 100644
index 5585487c79e4..000000000000
--- a/dev-qt/qtscxml/qtscxml-5.13.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/qtsensors-5.13.2.ebuild b/dev-qt/qtsensors/qtsensors-5.13.2.ebuild
index 64771d6be2fe..498d216d140c 100644
--- a/dev-qt/qtsensors/qtsensors-5.13.2.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.13.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="arm"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest
index a5132e04f5e5..bd3f72594e3b 100644
--- a/dev-qt/qtserialbus/Manifest
+++ b/dev-qt/qtserialbus/Manifest
@@ -1,2 +1 @@
-DIST qtserialbus-everywhere-src-5.13.2.tar.xz 338428 BLAKE2B 10f0a7129d1d770811aacf1ca961f6be6b3f69a86435b10f345e3e825e7bf12f01c4909636cd57ddb93561a5ae12711c63016a9613dadf1a4e41815f60b0eea7 SHA512 2a38de115ea51579119e5cb0e65b15f9105d24d0166c6dec0922cbe4b751442fcfd9b82ef90b55bc64369bd1bfe18c99b04e37b0b8cbec01e781e18cead74fdf
 DIST qtserialbus-everywhere-src-5.14.1.tar.xz 349772 BLAKE2B fcc687c695469a533da08d8d3a890b55ce05f301998db6bd6686c0bcf11a1d52ca1c30fbc7eaffd5d64c76479bff82480ce64fa99d7b25b0146e83d294093ff0 SHA512 e03005b386e79d802505caee459e7c3af54585f82ed55b3772ecea4523bbc2051ff31882f8370500ceaaab6ec400f34429ab24bece685d419ef32a34b02e1e99
diff --git a/dev-qt/qtserialbus/qtserialbus-5.13.2.ebuild b/dev-qt/qtserialbus/qtserialbus-5.13.2.ebuild
deleted file mode 100644
index 4a031a9a92a1..000000000000
--- a/dev-qt/qtserialbus/qtserialbus-5.13.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	~dev-qt/qtserialport-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtserialport/qtserialport-5.13.2.ebuild b/dev-qt/qtserialport/qtserialport-5.13.2.ebuild
index 5b23f0ad73b9..b1038a2a4660 100644
--- a/dev-qt/qtserialport/qtserialport-5.13.2.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/qtspeech-5.13.2.ebuild b/dev-qt/qtspeech/qtspeech-5.13.2.ebuild
index 9e7972000296..465c0e9fce4e 100644
--- a/dev-qt/qtspeech/qtspeech-5.13.2.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.13.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=7
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="~arm"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/qtsql-5.13.2.ebuild b/dev-qt/qtsql/qtsql-5.13.2.ebuild
index 6582075ad558..4cdae4a99742 100644
--- a/dev-qt/qtsql/qtsql-5.13.2.ebuild
+++ b/dev-qt/qtsql/qtsql-5.13.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="arm"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.13.2.ebuild b/dev-qt/qtsvg/qtsvg-5.13.2.ebuild
index 0e0632d88105..02d30fb89227 100644
--- a/dev-qt/qtsvg/qtsvg-5.13.2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.13.2.ebuild b/dev-qt/qttest/qttest-5.13.2.ebuild
index 2c10e2f8a9aa..5b22143bec6d 100644
--- a/dev-qt/qttest/qttest-5.13.2.ebuild
+++ b/dev-qt/qttest/qttest-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.13.2.ebuild b/dev-qt/qttranslations/qttranslations-5.13.2.ebuild
index 325065d5d7ae..302854904b2c 100644
--- a/dev-qt/qttranslations/qttranslations-5.13.2.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild
index 6faeb3a7a8d3..53f2d0ca7bfc 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.2.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.13.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=7
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Customizable input framework and virtual keyboard for Qt"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~x86"
+	KEYWORDS="~arm"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
index 289fe1b38f5d..c7be17907c21 100644
--- a/dev-qt/qtwayland/qtwayland-5.13.2-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.13.2-r1.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 ~x86"
+	KEYWORDS="arm"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
index d6669e5de5b2..5827780c9b4d 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.13.2.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.13.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="arm"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index f5c244acbfc5..7e5b3e377e4d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~x86"
+	KEYWORDS="arm"
 fi
 
 IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
index d9c375383f56..a6dbb84374e9 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.13.2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.13.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="arm"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index f831b8e73d56..6a7d5a5dfaa4 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,2 +1 @@
-DIST qtwebview-everywhere-src-5.13.2.tar.xz 131168 BLAKE2B cea040bbc352244b6bc51eb5ac2c762a5ff3a173ef725f06ff39f70988534189fd9313190c260cc0b0c92390eaf85c7949aaba88c9e6d4ad6208d65a583f6c2d SHA512 e149bea2d76db859f1a2523793108963849332384ca6af9fa45be8e88b321405698edb89f3471ad99f05cf50b3921a8a7d2c2aab63ca1040ba8446abe3612954
 DIST qtwebview-everywhere-src-5.14.1.tar.xz 132824 BLAKE2B 13e8bd20a4f4442e009a3b3c867f30bed49d40051b5adc0d5f7ba83724719428a63903495d27301543caabe90c65c55abd6dd1414fdad9f7dc118fd130ad76d6 SHA512 80345be7571b8e386c7f8bf343a7afc6bda712437e7426021823b87c48618dfc9c4863dd74a533f88d0cb259927b89f7eaeedce3caac503b152107c9002c8e3a
diff --git a/dev-qt/qtwebview/qtwebview-5.13.2.ebuild b/dev-qt/qtwebview/qtwebview-5.13.2.ebuild
deleted file mode 100644
index fa902e48fdd5..000000000000
--- a/dev-qt/qtwebview/qtwebview-5.13.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="Module for displaying web content in a QML application using the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64"
-fi
-
-IUSE=""
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtdeclarative-${PV}
-	~dev-qt/qtgui-${PV}
-	~dev-qt/qtwebengine-${PV}
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
index 52905175b0bc..f7e4091ffcce 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.13.2.ebuild
@@ -8,7 +8,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="arm"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild b/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild
index 7ee31c275b50..3dfc49ae8862 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.13.2.ebuild
@@ -7,7 +7,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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.13.2.ebuild b/dev-qt/qtxml/qtxml-5.13.2.ebuild
index 1ad789e00e24..3637e388d74d 100644
--- a/dev-qt/qtxml/qtxml-5.13.2.ebuild
+++ b/dev-qt/qtxml/qtxml-5.13.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="arm"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild
index 8133cada3102..4c67c496e6b4 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.2.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.13.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="arm"
 fi
 
 IUSE="qml"