dev-qt: stabilise 5.9.4 for amd64/x86

Bug: https://bugs.gentoo.org/642822
Package-Manager: Portage-2.3.24, Repoman-2.3.6

46 files changed, 47 insertions, 47 deletions

diff --git a/dev-qt/assistant/assistant-5.9.4.ebuild b/dev-qt/assistant/assistant-5.9.4.ebuild
index 0fe2bc14566e..bf221a65c9fe 100644
--- a/dev-qt/assistant/assistant-5.9.4.ebuild
+++ b/dev-qt/assistant/assistant-5.9.4.ebuild
@@ -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 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.9.4.ebuild b/dev-qt/designer/designer-5.9.4.ebuild
index 7ccb53b004a7..2c4b2c6fef79 100644
--- a/dev-qt/designer/designer-5.9.4.ebuild
+++ b/dev-qt/designer/designer-5.9.4.ebuild
@@ -8,7 +8,7 @@ inherit desktop gnome2-utils qt5-build
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild b/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
index b8323d837ce6..2aa76db15639 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.9.4.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.9.4.ebuild b/dev-qt/linguist/linguist-5.9.4.ebuild
index 38f06fe3f5d8..1fd9ba73163c 100644
--- a/dev-qt/linguist/linguist-5.9.4.ebuild
+++ b/dev-qt/linguist/linguist-5.9.4.ebuild
@@ -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 ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.9.4.ebuild b/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
index 7bcdc97e3066..5e3f1793d64a 100644
--- a/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.9.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.9.4.ebuild b/dev-qt/qdbus/qdbus-5.9.4.ebuild
index 71a8d2de4edc..8655c74acdff 100644
--- a/dev-qt/qdbus/qdbus-5.9.4.ebuild
+++ b/dev-qt/qdbus/qdbus-5.9.4.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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
index ceb1e6f94f87..a6952a0e92a8 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.9.4.ebuild
@@ -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 ~hppa ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdoc/qdoc-5.9.4.ebuild b/dev-qt/qdoc/qdoc-5.9.4.ebuild
index 85387f5f9aed..d13bd4db33fc 100644
--- a/dev-qt/qdoc/qdoc-5.9.4.ebuild
+++ b/dev-qt/qdoc/qdoc-5.9.4.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="Qt documentation generator"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild b/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
index 58d73f53a8fb..afd30f95aa81 100644
--- a/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.9.4_p201801220610.ebuild
@@ -24,7 +24,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="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 IUSE="charts datavis networkauth script speech virtualkeyboard webengine"
 
diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild
index 7f4a8b1b3eb7..a290372bd854 100644
--- a/dev-qt/qtbluetooth/qtbluetooth-5.9.4.ebuild
+++ b/dev-qt/qtbluetooth/qtbluetooth-5.9.4.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/qtconcurrent-5.9.4.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild
index 031ee2426b1a..9e38889d70d8 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.9.4.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild b/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
index fbcc9465aa68..653912be4c07 100644
--- a/dev-qt/qtcore/qtcore-5.9.4-r2.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.4-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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="icu systemd"
diff --git a/dev-qt/qtdbus/qtdbus-5.9.4.ebuild b/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
index a5a0e9b6ecf6..cc9b3d5b6cee 100644
--- a/dev-qt/qtdbus/qtdbus-5.9.4.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
index 870b5cb7cbf1..2e24febe74aa 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.9.4.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.9.4.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 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild
index 11fdd6f0016b..d1b9e9069863 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.9.4.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/qtgui-5.9.4-r3.ebuild b/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
index 60e841657005..e6e83eebfe1c 100644
--- a/dev-qt/qtgui/qtgui-5.9.4-r3.ebuild
+++ b/dev-qt/qtgui/qtgui-5.9.4-r3.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 # TODO: linuxfb
diff --git a/dev-qt/qthelp/qthelp-5.9.4.ebuild b/dev-qt/qthelp/qthelp-5.9.4.ebuild
index f011d68d1f5d..031f43bc01a6 100644
--- a/dev-qt/qthelp/qthelp-5.9.4.ebuild
+++ b/dev-qt/qthelp/qthelp-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild b/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild
index 5b10805b2ac2..edff3d6dde72 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.9.4.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.9.4.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 ~hppa ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc64 x86"
 fi
 
 IUSE="jpeg2k mng"
diff --git a/dev-qt/qtlocation/qtlocation-5.9.4.ebuild b/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
index f791b5b325e3..f228e74b4fed 100644
--- a/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.9.4.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="The Location module 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/qtmultimedia-5.9.4-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
index b7c218e81e8c..8629fd5a9799 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4-r1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.9.4-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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
index 2d421a1c4ede..9e7d51bc54ec 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.9.4.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="bindist connman libproxy libressl networkmanager +ssl"
diff --git a/dev-qt/qtopengl/qtopengl-5.9.4.ebuild b/dev-qt/qtopengl/qtopengl-5.9.4.ebuild
index 6c5b300af5b7..e724c035fc1a 100644
--- a/dev-qt/qtopengl/qtopengl-5.9.4.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="gles2"
diff --git a/dev-qt/qtpaths/qtpaths-5.9.4.ebuild b/dev-qt/qtpaths/qtpaths-5.9.4.ebuild
index 10da6032f791..b1abe77e01f6 100644
--- a/dev-qt/qtpaths/qtpaths-5.9.4.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.9.4.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 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild b/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
index 2af4b954c373..687fe7414f7a 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.9.4.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.9.4.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 IUSE="geoclue qml"
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild
index 363c3676c93a..53e6f2ff96ba 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.9.4.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="cups gles2"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
index 87ef504ea464..16a635d2856a 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9.4.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete 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="+widgets"
diff --git a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
index aa6bccf51564..53ac04d9af39 100644
--- a/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
+++ b/dev-qt/qtquickcontrols2/qtquickcontrols2-5.9.4.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Set of next generation Qt Quick controls for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="widgets"
diff --git a/dev-qt/qtscript/qtscript-5.9.4.ebuild b/dev-qt/qtscript/qtscript-5.9.4.ebuild
index e6c1e4033d34..7da648fc9543 100644
--- a/dev-qt/qtscript/qtscript-5.9.4.ebuild
+++ b/dev-qt/qtscript/qtscript-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="+jit scripttools"
diff --git a/dev-qt/qtscxml/qtscxml-5.9.4.ebuild b/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
index 59b06ef21029..ca4f733913f9 100644
--- a/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
+++ b/dev-qt/qtscxml/qtscxml-5.9.4.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="State Chart XML (SCXML) support library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtsensors/qtsensors-5.9.4.ebuild b/dev-qt/qtsensors/qtsensors-5.9.4.ebuild
index 28845fe6f0fa..b46a406f82d2 100644
--- a/dev-qt/qtsensors/qtsensors-5.9.4.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.9.4.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 # TODO: simulator
diff --git a/dev-qt/qtserialport/qtserialport-5.9.4.ebuild b/dev-qt/qtserialport/qtserialport-5.9.4.ebuild
index 9798eabab40f..efcd948280db 100644
--- a/dev-qt/qtserialport/qtserialport-5.9.4.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.9.4.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/qtspeech-5.9.4.ebuild b/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
index 24627d2b8665..3b552c0e3d17 100644
--- a/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.9.4.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 # TODO: flite plugin - needs 2.0.0 (not yet in tree)
diff --git a/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild b/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild
index 1611bb803b13..3edce55500ff 100644
--- a/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.9.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
 DESCRIPTION="SQL abstraction library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.9.4-r2.ebuild b/dev-qt/qtsvg/qtsvg-5.9.4-r2.ebuild
index a81e929f4a5d..628795fb30e9 100644
--- a/dev-qt/qtsvg/qtsvg-5.9.4-r2.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.9.4-r2.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttest/qttest-5.9.4.ebuild b/dev-qt/qttest/qttest-5.9.4.ebuild
index c97885f4ea3d..02e73d917485 100644
--- a/dev-qt/qttest/qttest-5.9.4.ebuild
+++ b/dev-qt/qttest/qttest-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.9.4.ebuild b/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
index dab81528425d..91c8620e3a2b 100644
--- a/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.9.4.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Translation files for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
index 21fd992d37cf..770ad2ccfbb5 100644
--- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
+++ b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-5.9.4.ebuild
@@ -7,7 +7,7 @@ inherit qt5-build
 DESCRIPTION="Virtual keyboard plugin for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-fbsd"
 fi
 
 # TODO: unbudle libraries for more layouts
diff --git a/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
index 70a23dff1cf6..e0105019bddb 100644
--- a/dev-qt/qtwayland/qtwayland-5.9.4-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.9.4-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="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86"
 fi
 
 IUSE="+libinput xcomposite"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild
index 63c52e4c7747..801266a2f78e 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.9.4.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.9.4.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 IUSE="qml"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
index 6545b759d29d..d26a1ed64098 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.4.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="amd64 ~arm ~arm64 x86"
 fi
 
 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
index af4f3594111b..7a8887bdc2ad 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 # TODO: qttestlib
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild
index a0d178ca76b6..597e1dd442bc 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9.4.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9.4.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 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
 fi
 
 IUSE="qml +ssl"
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
index 861fc7b4a9f9..391d573e963d 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.4-r1.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 # keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild b/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild
index a25d2b8417a7..355c55b5f841 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.9.4.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.9.4.ebuild b/dev-qt/qtxml/qtxml-5.9.4.ebuild
index 21a916d69959..e4fccdbc3f4b 100644
--- a/dev-qt/qtxml/qtxml-5.9.4.ebuild
+++ b/dev-qt/qtxml/qtxml-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild
index b6125e448bb7..aed191fc7479 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.9.4.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 ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 x86 ~amd64-fbsd"
 fi
 
 IUSE=""