[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtsensors/, dev-qt/qtgraphicaleffects/, dev-qt/qtpaths/, dev-qt/qtopengl/, ...

[Andreas Sturmlechner]

commit:     6c9dcbf7daa0604622d9a8b642ac27426135be83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 25 23:50:40 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 29 20:27:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9dcbf7

dev-qt: Drop all KEYWORDS from 5.12.3 except arm, x86

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/assistant/assistant-5.12.3.ebuild            |  4 ++--
 dev-qt/designer/designer-5.12.3.ebuild              |  4 ++--
 dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild  |  4 ++--
 dev-qt/linguist/linguist-5.12.3.ebuild              |  4 ++--
 dev-qt/pixeltool/pixeltool-5.12.3.ebuild            |  4 ++--
 dev-qt/qdbus/qdbus-5.12.3.ebuild                    |  4 ++--
 dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild        |  4 ++--
 dev-qt/qdoc/qdoc-5.12.3.ebuild                      |  4 ++--
 dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild  |  4 ++--
 dev-qt/qt3d/qt3d-5.12.3.ebuild                      |  4 ++--
 dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild        |  4 ++--
 dev-qt/qtcharts/qtcharts-5.12.3.ebuild              |  4 ++--
 dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild      |  4 ++--
 dev-qt/qtcore/qtcore-5.12.3.ebuild                  |  4 ++--
 dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild        |  4 ++--
 dev-qt/qtdbus/qtdbus-5.12.3.ebuild                  |  4 ++--
 dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild    |  2 +-
 dev-qt/qtdiag/qtdiag-5.12.3.ebuild                  |  4 ++--
 .../qtgraphicaleffects-5.12.3.ebuild                |  4 ++--
 dev-qt/qtgui/qtgui-5.12.3-r1.ebuild                 |  4 ++--
 dev-qt/qthelp/qthelp-5.12.3.ebuild                  |  4 ++--
 dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild  |  4 ++--
 dev-qt/qtlocation/qtlocation-5.12.3.ebuild          |  4 ++--
 dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild      |  4 ++--
 dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild            |  4 ++--
 dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild    |  4 ++--
 dev-qt/qtopengl/qtopengl-5.12.3.ebuild              |  4 ++--
 dev-qt/qtpaths/qtpaths-5.12.3.ebuild                |  4 ++--
 dev-qt/qtplugininfo/qtplugininfo-5.12.3.ebuild      |  4 ++--
 dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild    |  4 ++--
 dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild  |  4 ++--
 .../qtquickcontrols/qtquickcontrols-5.12.3.ebuild   |  4 ++--
 .../qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild |  4 ++--
 dev-qt/qtscript/qtscript-5.12.3.ebuild              |  4 ++--
 dev-qt/qtscxml/qtscxml-5.12.3.ebuild                |  4 ++--
 dev-qt/qtsensors/qtsensors-5.12.3.ebuild            |  4 ++--
 dev-qt/qtserialbus/qtserialbus-5.12.3.ebuild        |  4 ++--
 dev-qt/qtserialport/qtserialport-5.12.3.ebuild      |  4 ++--
 dev-qt/qtspeech/qtspeech-5.12.3.ebuild              |  4 ++--
 dev-qt/qtsql/qtsql-5.12.3.ebuild                    |  4 ++--
 dev-qt/qtsvg/qtsvg-5.12.3.ebuild                    |  4 ++--
 dev-qt/qttest/qttest-5.12.3.ebuild                  |  4 ++--
 dev-qt/qttranslations/qttranslations-5.12.3.ebuild  |  4 ++--
 .../qtvirtualkeyboard-5.12.3.ebuild                 |  4 ++--
 dev-qt/qtwayland/qtwayland-5.12.3.ebuild            |  4 ++--
 dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild      |  4 ++--
 dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild        |  2 +-
 dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild      |  4 ++--
 dev-qt/qtwebview/Manifest                           |  1 -
 dev-qt/qtwebview/qtwebview-5.12.3.ebuild            | 21 ---------------------
 dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild            |  4 ++--
 dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild        |  4 ++--
 dev-qt/qtxml/qtxml-5.12.3.ebuild                    |  4 ++--
 dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild    |  4 ++--
 54 files changed, 102 insertions(+), 124 deletions(-)

diff --git a/dev-qt/assistant/assistant-5.12.3.ebuild b/dev-qt/assistant/assistant-5.12.3.ebuild
index 88f985ea3db..5a9d7abbba9 100644
--- a/dev-qt/assistant/assistant-5.12.3.ebuild
+++ b/dev-qt/assistant/assistant-5.12.3.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
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 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 x86"
 fi
 
 IUSE="webkit"

diff --git a/dev-qt/designer/designer-5.12.3.ebuild b/dev-qt/designer/designer-5.12.3.ebuild
index afa520688ec..6770d674cda 100644
--- a/dev-qt/designer/designer-5.12.3.ebuild
+++ b/dev-qt/designer/designer-5.12.3.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
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 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 x86"
 fi
 
 IUSE="declarative webkit"

diff --git a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild b/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
index 8ab7c09c221..25b6f2ea326 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.12.3.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="qml"

diff --git a/dev-qt/linguist/linguist-5.12.3.ebuild b/dev-qt/linguist/linguist-5.12.3.ebuild
index 3895d3a9f6d..a8112e4388c 100644
--- a/dev-qt/linguist/linguist-5.12.3.ebuild
+++ b/dev-qt/linguist/linguist-5.12.3.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
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 ~hppa ppc64 x86"
+	KEYWORDS="~arm x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild b/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
index eb3c472b75a..8b61712d8ed 100644
--- a/dev-qt/pixeltool/pixeltool-5.12.3.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qdbus/qdbus-5.12.3.ebuild b/dev-qt/qdbus/qdbus-5.12.3.ebuild
index 581b47e304b..f7542996687 100644
--- a/dev-qt/qdbus/qdbus-5.12.3.ebuild
+++ b/dev-qt/qdbus/qdbus-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
index ea6c2d47f82..f7f43961440 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.12.3.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.12.3.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
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qdoc/qdoc-5.12.3.ebuild b/dev-qt/qdoc/qdoc-5.12.3.ebuild
index 7a3172c33a9..1a0cbf0d138 100644
--- a/dev-qt/qdoc/qdoc-5.12.3.ebuild
+++ b/dev-qt/qdoc/qdoc-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="qml"

diff --git a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
index 93f38ccd41e..d8ad29ba642 100644
--- a/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.12.3_p201904161302.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
@@ -21,7 +21,7 @@ SRC_URI="${BASE_URI}/${PV_FULL}qt-everywhere-documentation.7z
 
 LICENSE="FDL-1.3"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="~arm x86"
 
 IUSE="3d bluetooth charts datavis declarative graphicaleffects +html location
 	multimedia networkauth +qch script sensors virtualkeyboard webengine"

diff --git a/dev-qt/qt3d/qt3d-5.12.3.ebuild b/dev-qt/qt3d/qt3d-5.12.3.ebuild
index 04590309a52..7144b00a5e2 100644
--- a/dev-qt/qt3d/qt3d-5.12.3.ebuild
+++ b/dev-qt/qt3d/qt3d-5.12.3.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
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="3D rendering module for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="x86"
 fi
 
 # TODO: gamepad, tools

diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
index c37c1bd6275..ac5b2bcc5a7 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.12.3.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="qml"

diff --git a/dev-qt/qtcharts/qtcharts-5.12.3.ebuild b/dev-qt/qtcharts/qtcharts-5.12.3.ebuild
index fe200dea97c..69f0bc347e1 100644
--- a/dev-qt/qtcharts/qtcharts-5.12.3.ebuild
+++ b/dev-qt/qtcharts/qtcharts-5.12.3.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
@@ -8,7 +8,7 @@ DESCRIPTION="Chart component library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~x86"
 fi
 
 IUSE="qml"

diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
index ec29cbf7224..f59eebc63b1 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.12.3.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtcore/qtcore-5.12.3.ebuild b/dev-qt/qtcore/qtcore-5.12.3.ebuild
index 1e82ae5ef2e..e952fc2cc0c 100644
--- a/dev-qt/qtcore/qtcore-5.12.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="icu systemd"

diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
index 4c1ad54bfa5..63f8299cae0 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.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
@@ -8,7 +8,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="x86"
 fi
 
 IUSE="gles2 qml"

diff --git a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild b/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
index 7438011eeb9..238ccd58751 100644
--- a/dev-qt/qtdbus/qtdbus-5.12.3.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
index 3ce08853af0..ded471a2163 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.12.3.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.12.3.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 x86"
 fi
 
 IUSE="gles2 +jit localstorage +widgets"

diff --git a/dev-qt/qtdiag/qtdiag-5.12.3.ebuild b/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
index 88cdf532c8b..7762da6fea5 100644
--- a/dev-qt/qtdiag/qtdiag-5.12.3.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.12.3.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
@@ -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 ~x86"
 fi
 
 IUSE="+network +widgets"

diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
index 2a22eb73c65..11fa5af3d6d 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild b/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
index 1487a3600a9..9da6bd76cb9 100644
--- a/dev-qt/qtgui/qtgui-5.12.3-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.12.3-r1.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
@@ -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 x86"
 fi
 
 # TODO: linuxfb

diff --git a/dev-qt/qthelp/qthelp-5.12.3.ebuild b/dev-qt/qthelp/qthelp-5.12.3.ebuild
index ed91e5a4225..0e5276c016f 100644
--- a/dev-qt/qthelp/qthelp-5.12.3.ebuild
+++ b/dev-qt/qthelp/qthelp-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild b/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
index a244180237e..1778fd4aa6e 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.12.3.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="mng"

diff --git a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild b/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
index d2a7145dd2e..56f8b9b1817 100644
--- a/dev-qt/qtlocation/qtlocation-5.12.3.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
index c9856054287..a9f5bb6c890 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.12.3.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"

diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
index dddeea3bbf8..cd32728f067 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.12.3.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="bindist connman libproxy networkmanager sctp +ssl"

diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
index 0bc1853f9f5..77962a0ca05 100644
--- a/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.ebuild
+++ b/dev-qt/qtnetworkauth/qtnetworkauth-5.12.3.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
@@ -8,7 +8,7 @@ DESCRIPTION="Network authorization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild b/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
index 22dea645733..8e3a48223c0 100644
--- a/dev-qt/qtopengl/qtopengl-5.12.3.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="gles2"

diff --git a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild b/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
index 609b769aeeb..73ab9f9f78f 100644
--- a/dev-qt/qtpaths/qtpaths-5.12.3.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtplugininfo/qtplugininfo-5.12.3.ebuild b/dev-qt/qtplugininfo/qtplugininfo-5.12.3.ebuild
index 5051b3835ed..1f61571490f 100644
--- a/dev-qt/qtplugininfo/qtplugininfo-5.12.3.ebuild
+++ b/dev-qt/qtplugininfo/qtplugininfo-5.12.3.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
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt5 plugin metadata dumper"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild b/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
index 4e15347cc36..6530441c019 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.12.3.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="geoclue +qml"

diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
index 6f9076a5c10..6f09126619b 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.12.3.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="cups gles2"

diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
index 91c7769e91e..6585fd05b1b 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="+widgets"

diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
index 928ab5744e5..082c63e0795 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="widgets"

diff --git a/dev-qt/qtscript/qtscript-5.12.3.ebuild b/dev-qt/qtscript/qtscript-5.12.3.ebuild
index bfc5235d497..fb743bab213 100644
--- a/dev-qt/qtscript/qtscript-5.12.3.ebuild
+++ b/dev-qt/qtscript/qtscript-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="+jit scripttools"

diff --git a/dev-qt/qtscxml/qtscxml-5.12.3.ebuild b/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
index 0dce5e726b9..2ebe2ae87f1 100644
--- a/dev-qt/qtscxml/qtscxml-5.12.3.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.12.3.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
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild b/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
index b4da6715668..816b74b09c1 100644
--- a/dev-qt/qtsensors/qtsensors-5.12.3.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.12.3.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
@@ -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 x86"
 fi
 
 # TODO: simulator

diff --git a/dev-qt/qtserialbus/qtserialbus-5.12.3.ebuild b/dev-qt/qtserialbus/qtserialbus-5.12.3.ebuild
index 7a679090853..c42a8b2dbcc 100644
--- a/dev-qt/qtserialbus/qtserialbus-5.12.3.ebuild
+++ b/dev-qt/qtserialbus/qtserialbus-5.12.3.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
@@ -7,7 +7,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"
+	KEYWORDS="~x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild b/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
index e7debfb41de..efc12e8b1ce 100644
--- a/dev-qt/qtserialport/qtserialport-5.12.3.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild b/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
index b967afb594d..d33ed8c6702 100644
--- a/dev-qt/qtspeech/qtspeech-5.12.3.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.12.3.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
@@ -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 x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)

diff --git a/dev-qt/qtsql/qtsql-5.12.3.ebuild b/dev-qt/qtsql/qtsql-5.12.3.ebuild
index 32aa7a8e1df..5380e0e1dff 100644
--- a/dev-qt/qtsql/qtsql-5.12.3.ebuild
+++ b/dev-qt/qtsql/qtsql-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"

diff --git a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild b/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
index 651d1bca111..55dc3766278 100644
--- a/dev-qt/qtsvg/qtsvg-5.12.3.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qttest/qttest-5.12.3.ebuild b/dev-qt/qttest/qttest-5.12.3.ebuild
index 7b15182e976..89f3ae8814c 100644
--- a/dev-qt/qttest/qttest-5.12.3.ebuild
+++ b/dev-qt/qttest/qttest-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild b/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
index 8270188c559..26075dc5ce1 100644
--- a/dev-qt/qttranslations/qttranslations-5.12.3.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
index 1f68128f189..d81e51b8c8b 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.12.3.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
@@ -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 x86"
 fi
 
 # TODO: unbudle libraries for more layouts

diff --git a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild b/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
index 83ca21f6fc4..8cc97662734 100644
--- a/dev-qt/qtwayland/qtwayland-5.12.3.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="+libinput xcomposite"

diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
index d5e5ba7362f..b8ea150a4a5 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.12.3.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="qml"

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index f79b8784315..fbd7648f6f0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils 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 x86"
 fi
 
 IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
index d999e123ec1..116ef775f5a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.12.3.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="qml +ssl"

diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest
index 89b18a8515c..02bd13211e2 100644
--- a/dev-qt/qtwebview/Manifest
+++ b/dev-qt/qtwebview/Manifest
@@ -1,4 +1,3 @@
-DIST qtwebview-everywhere-src-5.12.3.tar.xz 131136 BLAKE2B 09ff2437cd66bd0c5896fd2e0d7910d9e3ad14bb710bc6c8d4f9bd9e37b12401e0d82a0fbd74a9b48425419d9120b53cbe93f3eaf2b942e261d91cca0638c8cf SHA512 426227b9b4cb61c0e88958dbaab21e842a25989098a0e94a06fe3efc8a2b9d4a5d3216296c8228da977ef52cd5844b66048bcb84019da4f06de1b1009dfdffa5
 DIST qtwebview-everywhere-src-5.13.2.tar.xz 131168 BLAKE2B cea040bbc352244b6bc51eb5ac2c762a5ff3a173ef725f06ff39f70988534189fd9313190c260cc0b0c92390eaf85c7949aaba88c9e6d4ad6208d65a583f6c2d SHA512 e149bea2d76db859f1a2523793108963849332384ca6af9fa45be8e88b321405698edb89f3471ad99f05cf50b3921a8a7d2c2aab63ca1040ba8446abe3612954
 DIST qtwebview-everywhere-src-5.14.0.tar.xz 132784 BLAKE2B 1e317ea0ff9a59193c16e2c9628dffa4d5a7e6f7112f5cafa91d6aefbbc0e2e43be7f4f0b4ee0b85e63ff34dc43c04737d5f0d99ebe60261d114412443891de5 SHA512 c10cf7b921735050dc4478462e404e2d59ca804b3e113aff95b38fd23c010e2e0d2267c6672a36a9cfe6a7d9c9bafa00b6b19d9a29293414824cb8a389642f91
 DIST qtwebview-everywhere-src-5.14.1.tar.xz 132824 BLAKE2B 13e8bd20a4f4442e009a3b3c867f30bed49d40051b5adc0d5f7ba83724719428a63903495d27301543caabe90c65c55abd6dd1414fdad9f7dc118fd130ad76d6 SHA512 80345be7571b8e386c7f8bf343a7afc6bda712437e7426021823b87c48618dfc9c4863dd74a533f88d0cb259927b89f7eaeedce3caac503b152107c9002c8e3a

diff --git a/dev-qt/qtwebview/qtwebview-5.12.3.ebuild b/dev-qt/qtwebview/qtwebview-5.12.3.ebuild
deleted file mode 100644
index 1c7076ec931..00000000000
--- a/dev-qt/qtwebview/qtwebview-5.12.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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.12.3.ebuild b/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
index f8576b16ddc..0a383e2738e 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.12.3.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.12.3.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
@@ -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 x86"
 fi
 
 # keep IUSE defaults in sync with qtgui

diff --git a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild b/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
index 6cf6ca6795d..9cb19dfdec1 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.12.3.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtxml/qtxml-5.12.3.ebuild b/dev-qt/qtxml/qtxml-5.12.3.ebuild
index e46516e178c..5089d1feca9 100644
--- a/dev-qt/qtxml/qtxml-5.12.3.ebuild
+++ b/dev-qt/qtxml/qtxml-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE=""

diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
index 9898c155558..47027643805 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.12.3.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
@@ -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 x86"
 fi
 
 IUSE="qml"