kde-apps: stabilise 16.04.3 on amd64/x86

Gentoo-bug: 590488

Package-Manager: portage-2.3.0

230 files changed, 230 insertions, 230 deletions

diff --git a/kde-apps/analitza/analitza-16.04.3.ebuild b/kde-apps/analitza/analitza-16.04.3.ebuild
index e41e6e33d152..e36289757838 100644
--- a/kde-apps/analitza/analitza-16.04.3.ebuild
+++ b/kde-apps/analitza/analitza-16.04.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE library for mathematical features"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="eigen opengl"
 
 DEPEND="
diff --git a/kde-apps/ark/ark-16.04.3.ebuild b/kde-apps/ark/ark-16.04.3.ebuild
index 1f2cfe1db52c..25bf522fc2bf 100644
--- a/kde-apps/ark/ark-16.04.3.ebuild
+++ b/kde-apps/ark/ark-16.04.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="https://www.kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bzip2 lzma zlib"
 
 RDEPEND="
diff --git a/kde-apps/artikulate/artikulate-16.04.3.ebuild b/kde-apps/artikulate/artikulate-16.04.3.ebuild
index 54adef8b9ea2..35dbb5a0459c 100644
--- a/kde-apps/artikulate/artikulate-16.04.3.ebuild
+++ b/kde-apps/artikulate/artikulate-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Language learning application that helps improving pronunciation skills"
 HOMEPAGE="https://edu.kde.org/applications/language/artikulate"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gstreamer qtmedia"
 
 DEPEND="
diff --git a/kde-apps/attica/attica-16.04.3.ebuild b/kde-apps/attica/attica-16.04.3.ebuild
index 8b82570d13b0..993511193d9d 100644
--- a/kde-apps/attica/attica-16.04.3.ebuild
+++ b/kde-apps/attica/attica-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-16.04.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-16.04.3.ebuild
index c93708a352ff..3d959dc97b73 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-16.04.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/baloo-widgets-16.04.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-16.04.3.ebuild
index 43707fbdd27f..e00a8ffec0cb 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-16.04.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="Widget library for baloo"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/blinken/blinken-16.04.3.ebuild b/kde-apps/blinken/blinken-16.04.3.ebuild
index 94a746b7a48b..1be9faebd166 100644
--- a/kde-apps/blinken/blinken-16.04.3.ebuild
+++ b/kde-apps/blinken/blinken-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE version of the Simon Says game"
 HOMEPAGE="https://www.kde.org/applications/education/blinken
 https://edu.kde.org/blinken"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bomber/bomber-16.04.3.ebuild b/kde-apps/bomber/bomber-16.04.3.ebuild
index ccedda3c829e..c236e3534e75 100644
--- a/kde-apps/bomber/bomber-16.04.3.ebuild
+++ b/kde-apps/bomber/bomber-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE arcade bombing game"
 HOMEPAGE="https://www.kde.org/applications/games/bomber/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/bovo/bovo-16.04.3.ebuild b/kde-apps/bovo/bovo-16.04.3.ebuild
index 4481199f36a7..55a0de603178 100644
--- a/kde-apps/bovo/bovo-16.04.3.ebuild
+++ b/kde-apps/bovo/bovo-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Five-in-a-row Board Game"
 HOMEPAGE="https://www.kde.org/applications/games/bovo/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/cantor/cantor-16.04.3.ebuild b/kde-apps/cantor/cantor-16.04.3.ebuild
index bc2c493a0ca0..9b91c803381a 100644
--- a/kde-apps/cantor/cantor-16.04.3.ebuild
+++ b/kde-apps/cantor/cantor-16.04.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5 python-r1
 
 DESCRIPTION="Interface for doing mathematics and scientific computing"
 HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="analitza lua postscript python qalculate +R"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/cervisia/cervisia-16.04.3.ebuild b/kde-apps/cervisia/cervisia-16.04.3.ebuild
index d4f699bc636c..ee731da52764 100644
--- a/kde-apps/cervisia/cervisia-16.04.3.ebuild
+++ b/kde-apps/cervisia/cervisia-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="CVS frontend by KDE"
 HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-16.04.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-16.04.3.ebuild
index 23111dad3aaa..78dd5442de50 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-16.04.3.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="false"
 inherit kde5
 
 DESCRIPTION="Extra Dolphin plugins"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bazaar dropbox git mercurial subversion"
 
 # FIXME: required in root CMakeLists.txt, but:
diff --git a/kde-apps/dolphin/dolphin-16.04.3.ebuild b/kde-apps/dolphin/dolphin-16.04.3.ebuild
index 7129cf26e6c6..b5b90f65ac80 100644
--- a/kde-apps/dolphin/dolphin-16.04.3.ebuild
+++ b/kde-apps/dolphin/dolphin-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Plasma filemanager focusing on usability"
 HOMEPAGE="https://dolphin.kde.org https://www.kde.org/applications/system/dolphin"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="semantic-desktop thumbnail"
 
 DEPEND="
diff --git a/kde-apps/dragon/dragon-16.04.3.ebuild b/kde-apps/dragon/dragon-16.04.3.ebuild
index 18b32b261448..bbb0382ccdc0 100644
--- a/kde-apps/dragon/dragon-16.04.3.ebuild
+++ b/kde-apps/dragon/dragon-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="A simple video player"
 HOMEPAGE="https://www.kde.org/applications/multimedia/dragonplayer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/drkonqi/drkonqi-16.04.3.ebuild b/kde-apps/drkonqi/drkonqi-16.04.3.ebuild
index a26fdf255092..c7e206f854aa 100644
--- a/kde-apps/drkonqi/drkonqi-16.04.3.ebuild
+++ b/kde-apps/drkonqi/drkonqi-16.04.3.ebuild
@@ -9,7 +9,7 @@ WEBKIT_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-16.04.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-16.04.3.ebuild
index a889bc42eeb0..0dfb270b46f3 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-16.04.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="FFmpeg based thumbnail generator for video files"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libav"
 
 RDEPEND="
diff --git a/kde-apps/filelight/filelight-16.04.3.ebuild b/kde-apps/filelight/filelight-16.04.3.ebuild
index c86c82d016a1..41ac477f33f4 100644
--- a/kde-apps/filelight/filelight-16.04.3.ebuild
+++ b/kde-apps/filelight/filelight-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Visualise disk usage with interactive map of concentric, segmented rings"
 HOMEPAGE="https://utils.kde.org/projects/filelight"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/gpgmepp/gpgmepp-16.04.3.ebuild b/kde-apps/gpgmepp/gpgmepp-16.04.3.ebuild
index 7c131cf0f0b0..d55d652b982e 100644
--- a/kde-apps/gpgmepp/gpgmepp-16.04.3.ebuild
+++ b/kde-apps/gpgmepp/gpgmepp-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="C++ bindings for gpgme"
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/granatier/granatier-16.04.3.ebuild b/kde-apps/granatier/granatier-16.04.3.ebuild
index 72dfab1d9c85..a60c808c5c33 100644
--- a/kde-apps/granatier/granatier-16.04.3.ebuild
+++ b/kde-apps/granatier/granatier-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Bomberman game"
 HOMEPAGE="https://www.kde.org/applications/games/granatier/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/gwenview/gwenview-16.04.3.ebuild b/kde-apps/gwenview/gwenview-16.04.3.ebuild
index d9eb57051d28..aef153289202 100644
--- a/kde-apps/gwenview/gwenview-16.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/graphics/gwenview/
 	https://userbase.kde.org/Gwenview
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kipi raw semantic-desktop X"
 
 # requires running environment
diff --git a/kde-apps/jovie/jovie-16.04.3.ebuild b/kde-apps/jovie/jovie-16.04.3.ebuild
index fabd6b3ec11e..2d4c8b5808ac 100644
--- a/kde-apps/jovie/jovie-16.04.3.ebuild
+++ b/kde-apps/jovie/jovie-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Text to speech application"
 HOMEPAGE="https://www.kde.org/applications/utilities/jovie/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/juk/juk-16.04.3.ebuild b/kde-apps/juk/juk-16.04.3.ebuild
index 01ee84d95db5..093ab90dbabc 100644
--- a/kde-apps/juk/juk-16.04.3.ebuild
+++ b/kde-apps/juk/juk-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Jukebox and music manager by KDE"
 HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kaccessible/kaccessible-16.04.3.ebuild b/kde-apps/kaccessible/kaccessible-16.04.3.ebuild
index 7cd787e5b3a5..dff1d243fbc7 100644
--- a/kde-apps/kaccessible/kaccessible-16.04.3.ebuild
+++ b/kde-apps/kaccessible/kaccessible-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug +speechd"
 
 DEPEND="speechd? ( app-accessibility/speech-dispatcher )"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-16.04.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-16.04.3.ebuild
index b49345f253cc..a808e137d4ef 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-16.04.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-16.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Administer web accounts for the sites and services across the Plasm
 HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kaccounts-providers/kaccounts-providers-16.04.3.ebuild b/kde-apps/kaccounts-providers/kaccounts-providers-16.04.3.ebuild
index ad12fe6da1c7..0137f024dd5d 100644
--- a/kde-apps/kaccounts-providers/kaccounts-providers-16.04.3.ebuild
+++ b/kde-apps/kaccounts-providers/kaccounts-providers-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE accounts providers"
 HOMEPAGE="https://community.kde.org/KTp"
 LICENSE="LGPL-2.1"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kajongg/kajongg-16.04.3.ebuild b/kde-apps/kajongg/kajongg-16.04.3.ebuild
index 0d77cad41f0e..8e2dce130d40 100644
--- a/kde-apps/kajongg/kajongg-16.04.3.ebuild
+++ b/kde-apps/kajongg/kajongg-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 kde4-base
 
 DESCRIPTION="The classical Mah Jongg for four players"
 HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalgebra/kalgebra-16.04.3.ebuild b/kde-apps/kalgebra/kalgebra-16.04.3.ebuild
index 41834622ca8f..95c071f06e35 100644
--- a/kde-apps/kalgebra/kalgebra-16.04.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="MathML-based graph calculator by KDE"
 HOMEPAGE="https://www.kde.org/applications/education/kalgebra
 https://edu.kde.org/kalgebra"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="opengl readline"
 
 DEPEND="
diff --git a/kde-apps/kalzium/kalzium-16.04.3.ebuild b/kde-apps/kalzium/kalzium-16.04.3.ebuild
index 604f307280ac..7546c842aa7b 100644
--- a/kde-apps/kalzium/kalzium-16.04.3.ebuild
+++ b/kde-apps/kalzium/kalzium-16.04.3.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base flag-o-matic
 DESCRIPTION="Periodic table of the elements"
 HOMEPAGE="https://www.kde.org/applications/education/kalzium
 https://edu.kde.org/kalzium"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug editor +plasma solver"
 
 DEPEND="
diff --git a/kde-apps/kamera/kamera-16.04.3.ebuild b/kde-apps/kamera/kamera-16.04.3.ebuild
index a71415545d82..ce5395999299 100644
--- a/kde-apps/kamera/kamera-16.04.3.ebuild
+++ b/kde-apps/kamera/kamera-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Plasma integration for gphoto2 cameras"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kanagram/kanagram-16.04.3.ebuild b/kde-apps/kanagram/kanagram-16.04.3.ebuild
index 8aca8ff917b8..ff728079bbf0 100644
--- a/kde-apps/kanagram/kanagram-16.04.3.ebuild
+++ b/kde-apps/kanagram/kanagram-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Game based on anagrams of words"
 HOMEPAGE="https://www.kde.org/applications/education/kanagram
 https://edu.kde.org/kanagram"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapman/kapman-16.04.3.ebuild b/kde-apps/kapman/kapman-16.04.3.ebuild
index eb7f54bac0eb..91d3be560533 100644
--- a/kde-apps/kapman/kapman-16.04.3.ebuild
+++ b/kde-apps/kapman/kapman-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Pac-Man clone by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-16.04.3.ebuild b/kde-apps/kapptemplate/kapptemplate-16.04.3.ebuild
index cfef7de727a2..f53c5614038f 100644
--- a/kde-apps/kapptemplate/kapptemplate-16.04.3.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
 HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kate/kate-16.04.3.ebuild b/kde-apps/kate/kate-16.04.3.ebuild
index 15ae90529459..8951ed17ea2c 100644
--- a/kde-apps/kate/kate-16.04.3.ebuild
+++ b/kde-apps/kate/kate-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Kate is an advanced text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kate http://kate-editor.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+addons"
 
 DEPEND="
diff --git a/kde-apps/katomic/katomic-16.04.3.ebuild b/kde-apps/katomic/katomic-16.04.3.ebuild
index 62aa40cff56d..db847d80eaee 100644
--- a/kde-apps/katomic/katomic-16.04.3.ebuild
+++ b/kde-apps/katomic/katomic-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/katomic/
 	https://games.kde.org/game.php?game=katomic
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblackbox/kblackbox-16.04.3.ebuild b/kde-apps/kblackbox/kblackbox-16.04.3.ebuild
index 0a4b7f9f41c5..ff2c75ad609c 100644
--- a/kde-apps/kblackbox/kblackbox-16.04.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-16.04.3.ebuild
@@ -9,7 +9,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kblocks/kblocks-16.04.3.ebuild b/kde-apps/kblocks/kblocks-16.04.3.ebuild
index 7eb4a38ccae0..976671401ebb 100644
--- a/kde-apps/kblocks/kblocks-16.04.3.ebuild
+++ b/kde-apps/kblocks/kblocks-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="A single-player Tetris-like KDE game"
 HOMEPAGE="https://www.kde.org/applications/games/kblocks/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbounce/kbounce-16.04.3.ebuild b/kde-apps/kbounce/kbounce-16.04.3.ebuild
index da36764a753c..2bc1fd22eebc 100644
--- a/kde-apps/kbounce/kbounce-16.04.3.ebuild
+++ b/kde-apps/kbounce/kbounce-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kbounce/
 	https://games.kde.org/game.php?game=kbounce
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbreakout/kbreakout-16.04.3.ebuild b/kde-apps/kbreakout/kbreakout-16.04.3.ebuild
index 8629fcc522a2..b1ab28aa8458 100644
--- a/kde-apps/kbreakout/kbreakout-16.04.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-16.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kbreakout/
 	https://games.kde.org/game.php?game=kbreakout
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kbruch/kbruch-16.04.3.ebuild b/kde-apps/kbruch/kbruch-16.04.3.ebuild
index 5da391675787..5e4cd6369f21 100644
--- a/kde-apps/kbruch/kbruch-16.04.3.ebuild
+++ b/kde-apps/kbruch/kbruch-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Educational application to learn calculating with fractions"
 HOMEPAGE="https://www.kde.org/applications/education/kbruch https://edu.kde.org/kbruch"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-16.04.3.ebuild b/kde-apps/kcachegrind/kcachegrind-16.04.3.ebuild
index 0e345c221571..f18f5a996bba 100644
--- a/kde-apps/kcachegrind/kcachegrind-16.04.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE Frontend for Cachegrind"
 HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
 http://kcachegrind.sourceforge.net"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kcalc/kcalc-16.04.3.ebuild b/kde-apps/kcalc/kcalc-16.04.3.ebuild
index 353bc012d744..cf42e08f6f77 100644
--- a/kde-apps/kcalc/kcalc-16.04.3.ebuild
+++ b/kde-apps/kcalc/kcalc-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE calculator"
 HOMEPAGE="https://www.kde.org/applications/utilities/kcalc
 https://utils.kde.org/projects/kcalc"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kcharselect/kcharselect-16.04.3.ebuild b/kde-apps/kcharselect/kcharselect-16.04.3.ebuild
index ab01c1635579..8981c539edcb 100644
--- a/kde-apps/kcharselect/kcharselect-16.04.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE character selection utility"
 HOMEPAGE="https://www.kde.org/applications/utilities/kcharselect
 https://utils.kde.org/projects/kcharselect"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcmshell/kcmshell-16.04.3.ebuild b/kde-apps/kcmshell/kcmshell-16.04.3.ebuild
index ceb785b5bfb7..02128a311ff8 100644
--- a/kde-apps/kcmshell/kcmshell-16.04.3.ebuild
+++ b/kde-apps/kcmshell/kcmshell-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Utility to host KDE control modules independently of SystemSettings"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-16.04.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-16.04.3.ebuild
index d5903c511eab..489924e01b65 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-16.04.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE color selector/editor"
 HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kcontrol/kcontrol-16.04.3.ebuild b/kde-apps/kcontrol/kcontrol-16.04.3.ebuild
index 08dd5d18802b..2f6a34f490b6 100644
--- a/kde-apps/kcontrol/kcontrol-16.04.3.ebuild
+++ b/kde-apps/kcontrol/kcontrol-16.04.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kcron/kcron-16.04.3.ebuild b/kde-apps/kcron/kcron-16.04.3.ebuild
index 50cd3998ceba..8cfe7b0041b7 100644
--- a/kde-apps/kcron/kcron-16.04.3.ebuild
+++ b/kde-apps/kcron/kcron-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-apps-meta/kde-apps-meta-16.04.3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-16.04.3.ebuild
index 5edf883bbcbc..c9ccf7939809 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-16.04.3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Meta package for the KDE Applications collection"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="accessibility nls pim sdk"
 
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-16.04.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-16.04.3.ebuild
index a320756155ce..44c0f2fcd767 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-16.04.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="true"
 inherit kde5
 
 DESCRIPTION="KDE Development Scripts"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # kdelibs4support - required for kdex.dtd
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-16.04.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-16.04.3.ebuild
index dc7523daca94..9d7ae3c7b93e 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-16.04.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-16.04.3.ebuild
@@ -7,5 +7,5 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="KDE Development Utilities"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kde-l10n/kde-l10n-16.04.3.ebuild b/kde-apps/kde-l10n/kde-l10n-16.04.3.ebuild
index ba93054211ef..105f43005ab9 100644
--- a/kde-apps/kde-l10n/kde-l10n-16.04.3.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-16.04.3.ebuild
@@ -15,7 +15,7 @@ inherit kde5
 
 DESCRIPTION="KDE internationalization package"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kde-meta/kde-meta-16.04.3.ebuild b/kde-apps/kde-meta/kde-meta-16.04.3.ebuild
index 6cd5f88263d0..04d6e533816e 100644
--- a/kde-apps/kde-meta/kde-meta-16.04.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all KDE Plasma and Applications packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
index 3e41dccafe81..34fe19e8a94d 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.04.3.ebuild
@@ -17,7 +17,7 @@ inherit kde5
 DESCRIPTION="KDE legacy internationalization package"
 
 SLOT="4"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="
 	kde-base/kdelibs:4
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.04.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.04.3.ebuild
index 39ea8f0229db..31e186c474fb 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.04.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdeaccessibility - merge this to pull in all kdeaccessiblity-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.3.ebuild
index 6787640dc0d5..2fe6d5284fc7 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="KDE administration tools - merge this to pull in all kdeadmin-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+cron"
 
 # FIXME: Add back when ported
diff --git a/kde-apps/kdebase-data/kdebase-data-16.04.3.ebuild b/kde-apps/kdebase-data/kdebase-data-16.04.3.ebuild
index 8dd1d9614473..42c8fd03e099 100644
--- a/kde-apps/kdebase-data/kdebase-data-16.04.3.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	x11-themes/hicolor-icon-theme
diff --git a/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-16.04.3.ebuild b/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-16.04.3.ebuild
index cf1f880ec752..6ba7064cba33 100644
--- a/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-16.04.3.ebuild
+++ b/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-16.04.3.ebuild
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="Oxygen Plasma 4 desktop theme"
 IUSE=""
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild
index 84d9b459e902..2bedf896b134 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-16.04.3-r1.ebuild
@@ -10,7 +10,7 @@ KMMODULE="kioslave"
 WEBKIT_REQUIRED="optional"
 inherit kde4-meta
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 DESCRIPTION="KDE VFS framework - kioslaves present a filesystem-like view of arbitrary data"
 IUSE="+bzip2 exif debug lzma openexr samba +sftp"
 
diff --git a/kde-apps/kdebase-menu-icons/kdebase-menu-icons-16.04.3.ebuild b/kde-apps/kdebase-menu-icons/kdebase-menu-icons-16.04.3.ebuild
index 0d456fedce99..605e08124798 100644
--- a/kde-apps/kdebase-menu-icons/kdebase-menu-icons-16.04.3.ebuild
+++ b/kde-apps/kdebase-menu-icons/kdebase-menu-icons-16.04.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu icons"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
diff --git a/kde-apps/kdebase-menu/kdebase-menu-16.04.3.ebuild b/kde-apps/kdebase-menu/kdebase-menu-16.04.3.ebuild
index ec5cccf2889d..d7acc1a71e6f 100644
--- a/kde-apps/kdebase-menu/kdebase-menu-16.04.3.ebuild
+++ b/kde-apps/kdebase-menu/kdebase-menu-16.04.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="kde-menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE Menu query tool"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-16.04.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-16.04.3.ebuild
index e26ece07dda8..cf148b518c89 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-16.04.3.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Transitional package to pull in plasma-meta plus basic applications"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3.ebuild
index ce3f070fc601..053bbf5190a1 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="+oldwallet pam +webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdebugdialog/kdebugdialog-16.04.3.ebuild b/kde-apps/kdebugdialog/kdebugdialog-16.04.3.ebuild
index 2c94bbfad3f5..008ad5906697 100644
--- a/kde-apps/kdebugdialog/kdebugdialog-16.04.3.ebuild
+++ b/kde-apps/kdebugdialog/kdebugdialog-16.04.3.ebuild
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Dialog box for setting preferences for debug output"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-16.04.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-16.04.3.ebuild
index be0e9cdc7035..020522eec8e2 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-16.04.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-16.04.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Application to enable/disable qCDebug"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdecore-meta/kdecore-meta-16.04.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-16.04.3.ebuild
index 938d2cceebe1..a4c36521a018 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-16.04.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdecore - merge this to pull in the most basic applications"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+handbook minimal"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-data/kdeedu-data-16.04.3.ebuild b/kde-apps/kdeedu-data/kdeedu-data-16.04.3.ebuild
index 7da1080a171e..d478bfeb0b22 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-16.04.3.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-16.04.3.ebuild
@@ -9,7 +9,7 @@ KDE_DEBUG="false"
 inherit kde5
 
 DESCRIPTION="Shared icons, artwork and data files for educational applications"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdeedu-meta/kdeedu-meta-16.04.3.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-16.04.3.ebuild
index f4f4e697456e..5bcd629dc222 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-16.04.3.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="KDE educational apps - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="https://edu.kde.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+webkit"
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/kdegames-meta-16.04.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-16.04.3.ebuild
index 3238d467e8ab..d14dccb33b7e 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-16.04.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdegames - merge this to pull in all kdegames-derived packages"
 HOMEPAGE="https://games.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="opengl python"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-meta/kdegraphics-meta-16.04.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-16.04.3.ebuild
index f0e19e409aa5..a3632789e69f 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-16.04.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdegraphics - merge this to pull in all kdegraphics-derived packages"
 HOMEPAGE="https://www.kde.org/applications/graphics/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="scanner"
 
 RDEPEND="
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.04.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.04.3.ebuild
index 43f06d40e903..fe8396af37d7 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.04.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.04.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.04.3.ebuild
index 3a68f602490c..7931bb571069 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.04.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-16.04.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/multimedia/
 	https://multimedia.kde.org/
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+ffmpeg"
 
 RDEPEND="
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.04.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.04.3.ebuild
index c4f1e7c2d4b8..188f20f1e0ea 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.04.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdenetwork-meta/kdenetwork-meta-16.04.3.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.04.3.ebuild
index 73b9288e8a04..04be1ffd4a21 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-16.04.3.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="kdenetwork - merge this to pull in all kdenetwork-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ppp +telepathy"
 
 RDEPEND="
diff --git a/kde-apps/kdenlive/kdenlive-16.04.3.ebuild b/kde-apps/kdenlive/kdenlive-16.04.3.ebuild
index 9805c769992b..415a779fdc10 100644
--- a/kde-apps/kdenlive/kdenlive-16.04.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-16.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Non-linear video editing suite by KDE"
 HOMEPAGE="https://www.kdenlive.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gles2 v4l semantic-desktop"
 
 RDEPEND="
diff --git a/kde-apps/kdepasswd/kdepasswd-16.04.3.ebuild b/kde-apps/kdepasswd/kdepasswd-16.04.3.ebuild
index 645b0c1b8b0b..07cd8a291f99 100644
--- a/kde-apps/kdepasswd/kdepasswd-16.04.3.ebuild
+++ b/kde-apps/kdepasswd/kdepasswd-16.04.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-16.04.3.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-16.04.3.ebuild
index f57003033622..7d17e1465b48 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-16.04.3.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-16.04.3.ebuild
@@ -15,7 +15,7 @@ inherit kde5
 
 DESCRIPTION="KDE PIM internationalization package"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.04.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.04.3.ebuild
index 636bbb077bca..b97545176b7f 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.04.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug subversion"
 KMNAME="kdesdk-kioslaves"
 
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-16.04.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-16.04.3.ebuild
index 9226e1590096..61c28139b9d4 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-16.04.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="KDE SDK - merge this to pull in all kdesdk-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cvs"
 
 RDEPEND="
diff --git a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.04.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.04.3.ebuild
index 4390f7addfcd..fa656b388242 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.04.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Thumbnail generator for PO files"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdesu/kdesu-16.04.3.ebuild b/kde-apps/kdesu/kdesu-16.04.3.ebuild
index 99ad4f4699d7..ea7f7a8ef884 100644
--- a/kde-apps/kdesu/kdesu-16.04.3.ebuild
+++ b/kde-apps/kdesu/kdesu-16.04.3.ebuild
@@ -12,7 +12,7 @@ inherit kde4-meta
 # if not, USE-flag ?
 DESCRIPTION="KDE gui for su(1)"
 HOMEPAGE+=" https://techbase.kde.org/Projects/kdesu"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-16.04.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-16.04.3.ebuild
index 0257af2ceb49..0a8ef22feb28 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-16.04.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdeutils - merge this to pull in all kdeutils-derived packages"
 HOMEPAGE="https://www.kde.org/applications/utilities https://utils.kde.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cups floppy lirc"
 
 # FIXME: Add back when ported
diff --git a/kde-apps/kdewebdev-meta/kdewebdev-meta-16.04.3.ebuild b/kde-apps/kdewebdev-meta/kdewebdev-meta-16.04.3.ebuild
index bb3717459219..4701f419f86e 100644
--- a/kde-apps/kdewebdev-meta/kdewebdev-meta-16.04.3.ebuild
+++ b/kde-apps/kdewebdev-meta/kdewebdev-meta-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="KDE WebDev - merge this to pull in all kdewebdev-derived packages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # FIXME: Add back when ported
diff --git a/kde-apps/kdf/kdf-16.04.3.ebuild b/kde-apps/kdf/kdf-16.04.3.ebuild
index e51875186207..2e8e306f65c0 100644
--- a/kde-apps/kdf/kdf-16.04.3.ebuild
+++ b/kde-apps/kdf/kdf-16.04.3.ebuild
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE free disk space utility"
 HOMEPAGE="https://utils.kde.org/projects/kdf"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kdialog/kdialog-16.04.3.ebuild b/kde-apps/kdialog/kdialog-16.04.3.ebuild
index 45583887f417..7c30877dde4e 100644
--- a/kde-apps/kdialog/kdialog-16.04.3.ebuild
+++ b/kde-apps/kdialog/kdialog-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kdiamond/kdiamond-16.04.3.ebuild b/kde-apps/kdiamond/kdiamond-16.04.3.ebuild
index 7b503937bea6..fac23820fd40 100644
--- a/kde-apps/kdiamond/kdiamond-16.04.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-16.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kdiamond/
 	https://games.kde.org/game.php?game=kdiamond
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kdontchangethehostname/kdontchangethehostname-16.04.3.ebuild b/kde-apps/kdontchangethehostname/kdontchangethehostname-16.04.3.ebuild
index 8958d76a1466..6234d83c1ee7 100644
--- a/kde-apps/kdontchangethehostname/kdontchangethehostname-16.04.3.ebuild
+++ b/kde-apps/kdontchangethehostname/kdontchangethehostname-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Tool to inform Plasma about a change in hostname"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-16.04.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-16.04.3.ebuild
index f339c384d1b4..2ca241942c43 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-16.04.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-16.04.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/keditfiletype/keditfiletype-16.04.3.ebuild b/kde-apps/keditfiletype/keditfiletype-16.04.3.ebuild
index 8ee864280f6d..29331ebeb9aa 100644
--- a/kde-apps/keditfiletype/keditfiletype-16.04.3.ebuild
+++ b/kde-apps/keditfiletype/keditfiletype-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 # test fails, last checked for 4.2.89
diff --git a/kde-apps/kfile/kfile-16.04.3.ebuild b/kde-apps/kfile/kfile-16.04.3.ebuild
index b29e42c8a665..322ca5504054 100644
--- a/kde-apps/kfile/kfile-16.04.3.ebuild
+++ b/kde-apps/kfile/kfile-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Commandline frontend to KFileMetaInfo"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kfilereplace/kfilereplace-16.04.3.ebuild b/kde-apps/kfilereplace/kfilereplace-16.04.3.ebuild
index dddbeb8a8113..07c22f732d08 100644
--- a/kde-apps/kfilereplace/kfilereplace-16.04.3.ebuild
+++ b/kde-apps/kfilereplace/kfilereplace-16.04.3.ebuild
@@ -10,5 +10,5 @@ inherit kde4-meta
 
 DESCRIPTION="Powerful tool to search and replace in multiple files"
 HOMEPAGE="https://www.kde.org/applications/utilities/kfilereplace/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kfind/kfind-16.04.3.ebuild b/kde-apps/kfind/kfind-16.04.3.ebuild
index a12f7a29d93c..f811196315cb 100644
--- a/kde-apps/kfind/kfind-16.04.3.ebuild
+++ b/kde-apps/kfind/kfind-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE file finder utility"
 HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-16.04.3.ebuild b/kde-apps/kfloppy/kfloppy-16.04.3.ebuild
index 76bb7e18f66e..88d2a041217d 100644
--- a/kde-apps/kfloppy/kfloppy-16.04.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://utils.kde.org/projects/kfloppy/
 "
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kfmclient/kfmclient-16.04.3.ebuild b/kde-apps/kfmclient/kfmclient-16.04.3.ebuild
index 164be0880813..a325b9d11167 100644
--- a/kde-apps/kfmclient/kfmclient-16.04.3.ebuild
+++ b/kde-apps/kfmclient/kfmclient-16.04.3.ebuild
@@ -9,7 +9,7 @@ KMMODULE="konqueror/client"
 inherit kde4-meta
 
 DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 KMEXTRACTONLY="
diff --git a/kde-apps/kfourinline/kfourinline-16.04.3.ebuild b/kde-apps/kfourinline/kfourinline-16.04.3.ebuild
index 1014598bf2ce..7f6f2a8d0b0a 100644
--- a/kde-apps/kfourinline/kfourinline-16.04.3.ebuild
+++ b/kde-apps/kfourinline/kfourinline-16.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kfourinline/
 	https://games.kde.org/game.php?game=kfourinline
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kgeography/kgeography-16.04.3.ebuild b/kde-apps/kgeography/kgeography-16.04.3.ebuild
index 2d48061a459f..51fbd6089c18 100644
--- a/kde-apps/kgeography/kgeography-16.04.3.ebuild
+++ b/kde-apps/kgeography/kgeography-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Geography learning tool"
 HOMEPAGE="https://edu.kde.org/applications/miscellaneous/kgeography
 https://edu.kde.org/applications/all/kgeography"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kget/kget-16.04.3.ebuild b/kde-apps/kget/kget-16.04.3.ebuild
index c43163eeba79..effda83328e0 100644
--- a/kde-apps/kget/kget-16.04.3.ebuild
+++ b/kde-apps/kget/kget-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="An advanced download manager by KDE"
 HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug bittorrent gpg mms sqlite webkit"
 
 RDEPEND="
diff --git a/kde-apps/kglobalaccel/kglobalaccel-16.04.3.ebuild b/kde-apps/kglobalaccel/kglobalaccel-16.04.3.ebuild
index 7d62dfcba5cf..aa6ee0a8c104 100644
--- a/kde-apps/kglobalaccel/kglobalaccel-16.04.3.ebuild
+++ b/kde-apps/kglobalaccel/kglobalaccel-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-apps/kgoldrunner/kgoldrunner-16.04.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-16.04.3.ebuild
index ef09e0cb59b4..5a9d23478883 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-16.04.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kgoldrunner/
 	https://games.kde.org/game.php?game=kgoldrunner
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kgpg/kgpg-16.04.3.ebuild b/kde-apps/kgpg/kgpg-16.04.3.ebuild
index 26cddd4498f4..34bc6eedada5 100644
--- a/kde-apps/kgpg/kgpg-16.04.3.ebuild
+++ b/kde-apps/kgpg/kgpg-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde4-base
 DESCRIPTION="Frontend for GnuPG, a powerful encryption utility by KDE"
 HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
 https://utils.kde.org/projects/kgpg"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-16.04.3.ebuild b/kde-apps/khangman/khangman-16.04.3.ebuild
index 3726f44f15bd..cc18268d2e9f 100644
--- a/kde-apps/khangman/khangman-16.04.3.ebuild
+++ b/kde-apps/khangman/khangman-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Classical hangman game by KDE"
 HOMEPAGE="https://www.kde.org/applications/education/khangman
 https://edu.kde.org/khangman"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/khelpcenter/khelpcenter-16.04.3.ebuild b/kde-apps/khelpcenter/khelpcenter-16.04.3.ebuild
index fc4d6d1c7b2f..433c7abc1d05 100644
--- a/kde-apps/khelpcenter/khelpcenter-16.04.3.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="The KDE Help Center"
 HOMEPAGE+=" https://userbase.kde.org/KHelpCenter"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kholidays/kholidays-16.04.3.ebuild b/kde-apps/kholidays/kholidays-16.04.3.ebuild
index c9f9a8d32d62..abe2ca066486 100644
--- a/kde-apps/kholidays/kholidays-16.04.3.ebuild
+++ b/kde-apps/kholidays/kholidays-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Library to determine holidays and other special events for a geographical region"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiconfinder/kiconfinder-16.04.3.ebuild b/kde-apps/kiconfinder/kiconfinder-16.04.3.ebuild
index af0fcd213614..217053ee04ff 100644
--- a/kde-apps/kiconfinder/kiconfinder-16.04.3.ebuild
+++ b/kde-apps/kiconfinder/kiconfinder-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Finds an icon based on its name"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kig/kig-16.04.3.ebuild b/kde-apps/kig/kig-16.04.3.ebuild
index da0d12016a7c..a5ed4438b9ae 100644
--- a/kde-apps/kig/kig-16.04.3.ebuild
+++ b/kde-apps/kig/kig-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 kde5
 
 DESCRIPTION="KDE Interactive Geometry tool"
 HOMEPAGE="https://www.kde.org/applications/education/kig https://edu.kde.org/kig"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="geogebra scripting"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kigo/kigo-16.04.3.ebuild b/kde-apps/kigo/kigo-16.04.3.ebuild
index 48c54f8b16d9..6a54f9b58abb 100644
--- a/kde-apps/kigo/kigo-16.04.3.ebuild
+++ b/kde-apps/kigo/kigo-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Go game by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/killbots/killbots-16.04.3.ebuild b/kde-apps/killbots/killbots-16.04.3.ebuild
index 719db189489a..051173f03a6e 100644
--- a/kde-apps/killbots/killbots-16.04.3.ebuild
+++ b/kde-apps/killbots/killbots-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Kill the bots or they kill you!"
 HOMEPAGE="https://www.kde.org/applications/games/killbots/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-16.04.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-16.04.3.ebuild
index 134da5f28177..0b0c5b009179 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-16.04.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-16.04.3.ebuild
@@ -11,5 +11,5 @@ inherit kde4-meta
 
 DESCRIPTION="KDE web development - image map editor"
 HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kimgio/kimgio-16.04.3.ebuild b/kde-apps/kimgio/kimgio-16.04.3.ebuild
index 1bdc760e946f..44a16e0363ee 100644
--- a/kde-apps/kimgio/kimgio-16.04.3.ebuild
+++ b/kde-apps/kimgio/kimgio-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE WebP image format plugin"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="media-libs/libwebp:="
diff --git a/kde-apps/kio-extras/kio-extras-16.04.3.ebuild b/kde-apps/kio-extras/kio-extras-16.04.3.ebuild
index 04eed476b705..a958648fe876 100644
--- a/kde-apps/kio-extras/kio-extras-16.04.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="exif mtp openexr phonon samba +sftp slp"
 
 COMMON_DEPEND="
diff --git a/kde-apps/kioclient/kioclient-16.04.3.ebuild b/kde-apps/kioclient/kioclient-16.04.3.ebuild
index 1a8ffe771ed5..b6d77015ad74 100644
--- a/kde-apps/kioclient/kioclient-16.04.3.ebuild
+++ b/kde-apps/kioclient/kioclient-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kiriki/kiriki-16.04.3.ebuild b/kde-apps/kiriki/kiriki-16.04.3.ebuild
index d85ff54fa7c3..e48bdd020d38 100644
--- a/kde-apps/kiriki/kiriki-16.04.3.ebuild
+++ b/kde-apps/kiriki/kiriki-16.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kiriki/
 	https://games.kde.org/game.php?game=kiriki
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kiten/kiten-16.04.3.ebuild b/kde-apps/kiten/kiten-16.04.3.ebuild
index 30de2e3f5b16..948c691dc0b9 100644
--- a/kde-apps/kiten/kiten-16.04.3.ebuild
+++ b/kde-apps/kiten/kiten-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Japanese dictionary and reference"
 HOMEPAGE="https://www.kde.org/applications/education/kiten https://edu.kde.org/kiten"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kjumpingcube/kjumpingcube-16.04.3.ebuild b/kde-apps/kjumpingcube/kjumpingcube-16.04.3.ebuild
index ff2c65d2ad2c..0c7a81712bb9 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-16.04.3.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kjumpingcube/
 	https://games.kde.org/game.php?game=kjumpingcube
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klettres/klettres-16.04.3.ebuild b/kde-apps/klettres/klettres-16.04.3.ebuild
index f211614325f5..ab335576f7f6 100644
--- a/kde-apps/klettres/klettres-16.04.3.ebuild
+++ b/kde-apps/klettres/klettres-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Alphabet learning application"
 HOMEPAGE="https://www.kde.org/applications/education/klettres
 https://edu.kde.org/klettres"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klickety/klickety-16.04.3.ebuild b/kde-apps/klickety/klickety-16.04.3.ebuild
index fab2dcf2d3ce..66d25d02bd64 100644
--- a/kde-apps/klickety/klickety-16.04.3.ebuild
+++ b/kde-apps/klickety/klickety-16.04.3.ebuild
@@ -9,7 +9,7 @@ KDE_SELINUX_MODULE="games"
 inherit kde5
 
 DESCRIPTION="A game almost the same as ksame, but a bit different by KDE"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klines/klines-16.04.3.ebuild b/kde-apps/klines/klines-16.04.3.ebuild
index 4d9190b79a7a..c33a872be0a3 100644
--- a/kde-apps/klines/klines-16.04.3.ebuild
+++ b/kde-apps/klines/klines-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/klines/
 	https://games.kde.org/game.php?game=klines
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/klinkstatus/klinkstatus-16.04.3.ebuild b/kde-apps/klinkstatus/klinkstatus-16.04.3.ebuild
index a1dd4d1211c4..81f43f03ae55 100644
--- a/kde-apps/klinkstatus/klinkstatus-16.04.3.ebuild
+++ b/kde-apps/klinkstatus/klinkstatus-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE web development - link validity checker"
 HOMEPAGE="https://www.kde.org/applications/development/klinkstatus/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-16.04.3.ebuild b/kde-apps/kmag/kmag-16.04.3.ebuild
index 94af768ab63d..42b35e785387 100644
--- a/kde-apps/kmag/kmag-16.04.3.ebuild
+++ b/kde-apps/kmag/kmag-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-16.04.3.ebuild b/kde-apps/kmahjongg/kmahjongg-16.04.3.ebuild
index 32bc8833f27c..249242be57b6 100644
--- a/kde-apps/kmahjongg/kmahjongg-16.04.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kmahjongg/
 	https://games.kde.org/game.php?game=kmahjongg
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmimetypefinder/kmimetypefinder-16.04.3.ebuild b/kde-apps/kmimetypefinder/kmimetypefinder-16.04.3.ebuild
index 193a48bc550a..e9ec9e0cfe3b 100644
--- a/kde-apps/kmimetypefinder/kmimetypefinder-16.04.3.ebuild
+++ b/kde-apps/kmimetypefinder/kmimetypefinder-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE application to report the mimetype for a given file"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kmines/kmines-16.04.3.ebuild b/kde-apps/kmines/kmines-16.04.3.ebuild
index 05f3faebad9b..bfd70f68a2de 100644
--- a/kde-apps/kmines/kmines-16.04.3.ebuild
+++ b/kde-apps/kmines/kmines-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kmines/
 	https://games.kde.org/game.php?game=kmines
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kmix/kmix-16.04.3-r1.ebuild b/kde-apps/kmix/kmix-16.04.3-r1.ebuild
index cac642935ab4..440749c7ecce 100644
--- a/kde-apps/kmix/kmix-16.04.3-r1.ebuild
+++ b/kde-apps/kmix/kmix-16.04.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Plasma mixer gui"
 HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/kmousetool/kmousetool-16.04.3.ebuild b/kde-apps/kmousetool/kmousetool-16.04.3.ebuild
index 50ef8251009d..add128d659f1 100644
--- a/kde-apps/kmousetool/kmousetool-16.04.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE program that clicks the mouse for you"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kmouth/kmouth-16.04.3.ebuild b/kde-apps/kmouth/kmouth-16.04.3.ebuild
index d496e80ef274..3b7c19f9c790 100644
--- a/kde-apps/kmouth/kmouth-16.04.3.ebuild
+++ b/kde-apps/kmouth/kmouth-16.04.3.ebuild
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="Text-to-speech synthesizer front end"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kmplot/kmplot-16.04.3.ebuild b/kde-apps/kmplot/kmplot-16.04.3.ebuild
index 4ad71978e815..78cb154f6457 100644
--- a/kde-apps/kmplot/kmplot-16.04.3.ebuild
+++ b/kde-apps/kmplot/kmplot-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Mathematical function plotter"
 HOMEPAGE="https://www.kde.org/applications/education/kmplot https://edu.kde.org/kmplot"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knavalbattle/knavalbattle-16.04.3.ebuild b/kde-apps/knavalbattle/knavalbattle-16.04.3.ebuild
index f4e995e29d27..a2eba4c3b8c1 100644
--- a/kde-apps/knavalbattle/knavalbattle-16.04.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/navalbattle/
 	https://games.kde.org/game.php?game=kbattleship
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knetattach/knetattach-16.04.3.ebuild b/kde-apps/knetattach/knetattach-16.04.3.ebuild
index 31d921b50a90..1cf04658039e 100644
--- a/kde-apps/knetattach/knetattach-16.04.3.ebuild
+++ b/kde-apps/knetattach/knetattach-16.04.3.ebuild
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/knetwalk/knetwalk-16.04.3.ebuild b/kde-apps/knetwalk/knetwalk-16.04.3.ebuild
index 9f50da102f6b..e3a36f19dfed 100644
--- a/kde-apps/knetwalk/knetwalk-16.04.3.ebuild
+++ b/kde-apps/knetwalk/knetwalk-16.04.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/knetwalk/
 	https://games.kde.org/game.php?game=knetwalk
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/knewstuff/knewstuff-16.04.3.ebuild b/kde-apps/knewstuff/knewstuff-16.04.3.ebuild
index 6359312a89c8..ca14d60ad91e 100644
--- a/kde-apps/knewstuff/knewstuff-16.04.3.ebuild
+++ b/kde-apps/knewstuff/knewstuff-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/knotify/knotify-16.04.3.ebuild b/kde-apps/knotify/knotify-16.04.3.ebuild
index 877d1ccbc46f..10581d5e5b69 100644
--- a/kde-apps/knotify/knotify-16.04.3.ebuild
+++ b/kde-apps/knotify/knotify-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kolf/kolf-16.04.3.ebuild b/kde-apps/kolf/kolf-16.04.3.ebuild
index 0ab4e971b135..aa229326eae8 100644
--- a/kde-apps/kolf/kolf-16.04.3.ebuild
+++ b/kde-apps/kolf/kolf-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kolf/
 	https://games.kde.org/game.php?game=kolf
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kollision/kollision-16.04.3.ebuild b/kde-apps/kollision/kollision-16.04.3.ebuild
index 2b6dc94f39f6..724a0abda60b 100644
--- a/kde-apps/kollision/kollision-16.04.3.ebuild
+++ b/kde-apps/kollision/kollision-16.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kollision/
 	https://games.kde.org/game.php?game=kollision
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kolourpaint/kolourpaint-16.04.3.ebuild b/kde-apps/kolourpaint/kolourpaint-16.04.3.ebuild
index 012092ac48df..2ff3e30a6e75 100644
--- a/kde-apps/kolourpaint/kolourpaint-16.04.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Paint Program by KDE"
 HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 LICENSE="BSD LGPL-2"
 IUSE="debug scanner"
 
diff --git a/kde-apps/kommander/kommander-16.04.3.ebuild b/kde-apps/kommander/kommander-16.04.3.ebuild
index 576a81eec7b6..e4ae5c9bd242 100644
--- a/kde-apps/kommander/kommander-16.04.3.ebuild
+++ b/kde-apps/kommander/kommander-16.04.3.ebuild
@@ -11,5 +11,5 @@ inherit kde4-meta
 
 DESCRIPTION="KDE dialog system for scripting"
 HOMEPAGE="https://www.kde.org/applications/development/kommander/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kompare/kompare-16.04.3.ebuild b/kde-apps/kompare/kompare-16.04.3.ebuild
index 7490043d26e3..98f7f19fbd83 100644
--- a/kde-apps/kompare/kompare-16.04.3.ebuild
+++ b/kde-apps/kompare/kompare-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="A program to view the differences between files"
 HOMEPAGE="https://www.kde.org/applications/development/kompare
 http://www.caffeinated.me.uk/kompare"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/konq-plugins/konq-plugins-16.04.3.ebuild b/kde-apps/konq-plugins/konq-plugins-16.04.3.ebuild
index 8da31e707e44..1dba9c7be6af 100644
--- a/kde-apps/konq-plugins/konq-plugins-16.04.3.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild b/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
index 9a4f65477579..04ee20efd6e6 100644
--- a/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.3-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/internet/konqueror/
 	https://konqueror.org/
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+bookmarks debug +filemanager svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
diff --git a/kde-apps/konquest/konquest-16.04.3.ebuild b/kde-apps/konquest/konquest-16.04.3.ebuild
index 09052667b505..f9a378947b04 100644
--- a/kde-apps/konquest/konquest-16.04.3.ebuild
+++ b/kde-apps/konquest/konquest-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/konquest/
 	https://games.kde.org/game.php?game=konquest
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/konsole/konsole-16.04.3.ebuild b/kde-apps/konsole/konsole-16.04.3.ebuild
index 9c8777051096..83e7913df179 100644
--- a/kde-apps/konsole/konsole-16.04.3.ebuild
+++ b/kde-apps/konsole/konsole-16.04.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="KDE's terminal emulator"
 HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kopete/kopete-16.04.3.ebuild b/kde-apps/kopete/kopete-16.04.3.ebuild
index cd117ceb7106..c2225f7f3c16 100644
--- a/kde-apps/kopete/kopete-16.04.3.ebuild
+++ b/kde-apps/kopete/kopete-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
diff --git a/kde-apps/kpasswdserver/kpasswdserver-16.04.3.ebuild b/kde-apps/kpasswdserver/kpasswdserver-16.04.3.ebuild
index faf108e8dfa6..e854996a1e8e 100644
--- a/kde-apps/kpasswdserver/kpasswdserver-16.04.3.ebuild
+++ b/kde-apps/kpasswdserver/kpasswdserver-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-apps/kpat/kpat-16.04.3.ebuild b/kde-apps/kpat/kpat-16.04.3.ebuild
index 9d7c5917437f..67fc5c467043 100644
--- a/kde-apps/kpat/kpat-16.04.3.ebuild
+++ b/kde-apps/kpat/kpat-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE patience game"
 HOMEPAGE="https://games.kde.org/game.php?game=kpat"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kppp/kppp-16.04.3.ebuild b/kde-apps/kppp/kppp-16.04.3.ebuild
index c9e15f3a926a..6c9e0f44e0da 100644
--- a/kde-apps/kppp/kppp-16.04.3.ebuild
+++ b/kde-apps/kppp/kppp-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="A dialer and front-end to pppd"
 HOMEPAGE="https://www.kde.org/applications/internet/kppp"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kqtquickcharts/kqtquickcharts-16.04.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-16.04.3.ebuild
index 7ceaccba62e2..2d4bcd642c5e 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-16.04.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-16.04.3.ebuild
@@ -8,7 +8,7 @@ DECLARATIVE_REQUIRED="always"
 inherit kde4-base
 
 DESCRIPTION="Qt Quick 1 plugin for beautiful and interactive charts"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="$(add_kdeapps_dep plasma-runtime)"
diff --git a/kde-apps/kquitapp/kquitapp-16.04.3.ebuild b/kde-apps/kquitapp/kquitapp-16.04.3.ebuild
index c67efb4008d5..dfdacb5796d5 100644
--- a/kde-apps/kquitapp/kquitapp-16.04.3.ebuild
+++ b/kde-apps/kquitapp/kquitapp-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/krdc/krdc-16.04.3.ebuild b/kde-apps/krdc/krdc-16.04.3.ebuild
index ea37fe98a38e..bbee92d84279 100644
--- a/kde-apps/krdc/krdc-16.04.3.ebuild
+++ b/kde-apps/krdc/krdc-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Remote desktop connection (RDP and VNC) client"
 HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+rdesktop vnc"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 2016-01-24
diff --git a/kde-apps/kreadconfig/kreadconfig-16.04.3.ebuild b/kde-apps/kreadconfig/kreadconfig-16.04.3.ebuild
index 7ce32516ba7c..68e4d47a83b1 100644
--- a/kde-apps/kreadconfig/kreadconfig-16.04.3.ebuild
+++ b/kde-apps/kreadconfig/kreadconfig-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool to read KConfig entries"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kremotecontrol/kremotecontrol-16.04.3.ebuild b/kde-apps/kremotecontrol/kremotecontrol-16.04.3.ebuild
index 6d0195f01aa6..54a3dda2742b 100644
--- a/kde-apps/kremotecontrol/kremotecontrol-16.04.3.ebuild
+++ b/kde-apps/kremotecontrol/kremotecontrol-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
 HOMEPAGE="https://www.kde.org/applications/utilities/kremotecontrol
 https://utils.kde.org/projects/kremotecontrol"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kreversi/kreversi-16.04.3.ebuild b/kde-apps/kreversi/kreversi-16.04.3.ebuild
index 5fec7170a238..8709aa9aa88d 100644
--- a/kde-apps/kreversi/kreversi-16.04.3.ebuild
+++ b/kde-apps/kreversi/kreversi-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kreversi/
 	https://games.kde.org/game.php?game=kreversi
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/krfb/krfb-16.04.3.ebuild b/kde-apps/krfb/krfb-16.04.3.ebuild
index 4e78614efcb7..256f7a7a0434 100644
--- a/kde-apps/krfb/krfb-16.04.3.ebuild
+++ b/kde-apps/krfb/krfb-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
 HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kross-interpreters/kross-interpreters-16.04.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-16.04.3.ebuild
index 4563855eef19..7c270d60b8fa 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-16.04.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-16.04.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1 kde5
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kruler/kruler-16.04.3.ebuild b/kde-apps/kruler/kruler-16.04.3.ebuild
index 64ea073bcb66..fb6e21d9633e 100644
--- a/kde-apps/kruler/kruler-16.04.3.ebuild
+++ b/kde-apps/kruler/kruler-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Screen ruler for Plasma"
 HOMEPAGE="https://www.kde.org/applications/graphics/kruler/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/ksaneplugin/ksaneplugin-16.04.3.ebuild b/kde-apps/ksaneplugin/ksaneplugin-16.04.3.ebuild
index 7dd8d093de55..786642db16a1 100644
--- a/kde-apps/ksaneplugin/ksaneplugin-16.04.3.ebuild
+++ b/kde-apps/ksaneplugin/ksaneplugin-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="SANE Plugin by KDE"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kscd/kscd-16.04.3.ebuild b/kde-apps/kscd/kscd-16.04.3.ebuild
index 1cb5463e376e..582799ec2e8f 100644
--- a/kde-apps/kscd/kscd-16.04.3.ebuild
+++ b/kde-apps/kscd/kscd-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE CD player"
 HOMEPAGE="https://www.kde.org/applications/multimedia/kscd/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kshisen/kshisen-16.04.3.ebuild b/kde-apps/kshisen/kshisen-16.04.3.ebuild
index 649f07eaab94..75a9fd744432 100644
--- a/kde-apps/kshisen/kshisen-16.04.3.ebuild
+++ b/kde-apps/kshisen/kshisen-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kshisen/
 	https://games.kde.org/game.php?game=kshisen
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ksirk/ksirk-16.04.3.ebuild b/kde-apps/ksirk/ksirk-16.04.3.ebuild
index 8542e3488dd8..338e075db6b1 100644
--- a/kde-apps/ksirk/ksirk-16.04.3.ebuild
+++ b/kde-apps/ksirk/ksirk-16.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksirk/
 	https://games.kde.org/game.php?game=ksirk
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-16.04.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-16.04.3.ebuild
index 5f0d17ca5c02..a9cdb0583995 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-16.04.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Tron game"
 HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-16.04.3.ebuild b/kde-apps/kspaceduel/kspaceduel-16.04.3.ebuild
index 35a48b928d64..ec99a5803519 100644
--- a/kde-apps/kspaceduel/kspaceduel-16.04.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kspaceduel/
 	https://games.kde.org/game.php?game=kspaceduel
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/ksquares/ksquares-16.04.3.ebuild b/kde-apps/ksquares/ksquares-16.04.3.ebuild
index d8305bc891a9..5fb331a2716d 100644
--- a/kde-apps/ksquares/ksquares-16.04.3.ebuild
+++ b/kde-apps/ksquares/ksquares-16.04.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksquares/
 	https://games.kde.org/game.php?game=ksquares
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kstars/kstars-16.04.3-r1.ebuild b/kde-apps/kstars/kstars-16.04.3-r1.ebuild
index 24cd07440e21..b2e9f59079d2 100644
--- a/kde-apps/kstars/kstars-16.04.3-r1.ebuild
+++ b/kde-apps/kstars/kstars-16.04.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Desktop Planetarium"
 HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="indi wcs xplanet"
 
 # TODO: AstrometryNet requires new package
diff --git a/kde-apps/kstart/kstart-16.04.3.ebuild b/kde-apps/kstart/kstart-16.04.3.ebuild
index 76d219dc07ac..0982c0317112 100644
--- a/kde-apps/kstart/kstart-16.04.3.ebuild
+++ b/kde-apps/kstart/kstart-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/ksudoku/ksudoku-16.04.3.ebuild b/kde-apps/ksudoku/ksudoku-16.04.3.ebuild
index d320923ed5e6..22a3e4b15e79 100644
--- a/kde-apps/ksudoku/ksudoku-16.04.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksudoku/
 	https://games.kde.org/game.php?game=ksudoku
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/ksystemlog/ksystemlog-16.04.3.ebuild b/kde-apps/ksystemlog/ksystemlog-16.04.3.ebuild
index 528c3edca98c..de52949deb38 100644
--- a/kde-apps/ksystemlog/ksystemlog-16.04.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="System log viewer by KDE"
 HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="systemd"
 
 # bug 378101
diff --git a/kde-apps/kteatime/kteatime-16.04.3.ebuild b/kde-apps/kteatime/kteatime-16.04.3.ebuild
index 7682638f92f1..bcd998c837fd 100644
--- a/kde-apps/kteatime/kteatime-16.04.3.ebuild
+++ b/kde-apps/kteatime/kteatime-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE timer for making a fine cup of tea"
 HOMEPAGE="https://www.kde.org/applications/games/kteatime"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimer/ktimer-16.04.3.ebuild b/kde-apps/ktimer/ktimer-16.04.3.ebuild
index ff62ce06f41c..c9fff5aaf4c4 100644
--- a/kde-apps/ktimer/ktimer-16.04.3.ebuild
+++ b/kde-apps/ktimer/ktimer-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="KDE Timer"
 HOMEPAGE="https://www.kde.org/applications/utilities/ktimer
 https://utils.kde.org/projects/ktimer"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktimezoned/ktimezoned-16.04.3.ebuild b/kde-apps/ktimezoned/ktimezoned-16.04.3.ebuild
index bd57865c0213..5a1d0c6a5fac 100644
--- a/kde-apps/ktimezoned/ktimezoned-16.04.3.ebuild
+++ b/kde-apps/ktimezoned/ktimezoned-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/ktouch/ktouch-16.04.3.ebuild b/kde-apps/ktouch/ktouch-16.04.3.ebuild
index 8e07e88dc013..dd72525f0557 100644
--- a/kde-apps/ktouch/ktouch-16.04.3.ebuild
+++ b/kde-apps/ktouch/ktouch-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Program that helps to learn and practice touch typing"
 HOMEPAGE="https://edu.kde.org/applications/miscellaneous/ktouch"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.04.3.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.04.3.ebuild
index 6f38e6425825..9751dd168d9e 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.04.3.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy account management kcm"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="experimental"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-approver/ktp-approver-16.04.3.ebuild b/kde-apps/ktp-approver/ktp-approver-16.04.3.ebuild
index 1abfd8c20da4..dfc9d96ebe48 100644
--- a/kde-apps/ktp-approver/ktp-approver-16.04.3.ebuild
+++ b/kde-apps/ktp-approver/ktp-approver-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy notification handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild
index 252e8a6ca288..5db6695affc6 100644
--- a/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild
+++ b/kde-apps/ktp-auth-handler/ktp-auth-handler-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy authentication handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-call-ui/ktp-call-ui-16.04.3.ebuild b/kde-apps/ktp-call-ui/ktp-call-ui-16.04.3.ebuild
index 627bae208133..48fb8fba0b6f 100644
--- a/kde-apps/ktp-call-ui/ktp-call-ui-16.04.3.ebuild
+++ b/kde-apps/ktp-call-ui/ktp-call-ui-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy audio/video conferencing ui"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-common-internals/ktp-common-internals-16.04.3.ebuild b/kde-apps/ktp-common-internals/ktp-common-internals-16.04.3.ebuild
index 5138671589e3..2a8381d2e6f0 100644
--- a/kde-apps/ktp-common-internals/ktp-common-internals-16.04.3.ebuild
+++ b/kde-apps/ktp-common-internals/ktp-common-internals-16.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE Telepathy common library"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="otr +sso"
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-contact-list/ktp-contact-list-16.04.3.ebuild b/kde-apps/ktp-contact-list/ktp-contact-list-16.04.3.ebuild
index 080884739031..cb90606fe7ef 100644
--- a/kde-apps/ktp-contact-list/ktp-contact-list-16.04.3.ebuild
+++ b/kde-apps/ktp-contact-list/ktp-contact-list-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy contact list"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-contact-runner/ktp-contact-runner-16.04.3.ebuild b/kde-apps/ktp-contact-runner/ktp-contact-runner-16.04.3.ebuild
index 93fbb5ccda98..5eef43eeea4c 100644
--- a/kde-apps/ktp-contact-runner/ktp-contact-runner-16.04.3.ebuild
+++ b/kde-apps/ktp-contact-runner/ktp-contact-runner-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy krunner plugin"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.04.3.ebuild b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.04.3.ebuild
index 1e5e797824d0..d82e5a8eddfa 100644
--- a/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.04.3.ebuild
+++ b/kde-apps/ktp-desktop-applets/ktp-desktop-applets-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy contact, presence and chat Plasma applets"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.04.3.ebuild b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.04.3.ebuild
index 37b39fd2558c..ea69c4969a5a 100644
--- a/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.04.3.ebuild
+++ b/kde-apps/ktp-filetransfer-handler/ktp-filetransfer-handler-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy file transfer handler"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-kded-module/ktp-kded-module-16.04.3.ebuild b/kde-apps/ktp-kded-module/ktp-kded-module-16.04.3.ebuild
index e0895eccb7b5..00f9f729b199 100644
--- a/kde-apps/ktp-kded-module/ktp-kded-module-16.04.3.ebuild
+++ b/kde-apps/ktp-kded-module/ktp-kded-module-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy workspace integration"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-l10n/ktp-l10n-16.04.3.ebuild b/kde-apps/ktp-l10n/ktp-l10n-16.04.3.ebuild
index be0cd370e6b7..e3f80f0e10fb 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-16.04.3.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-16.04.3.ebuild
@@ -15,7 +15,7 @@ inherit kde5
 
 DESCRIPTION="KDE Telepathy internationalization package"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/ktp-send-file/ktp-send-file-16.04.3.ebuild b/kde-apps/ktp-send-file/ktp-send-file-16.04.3.ebuild
index 7361e3c13992..15b145071d5f 100644
--- a/kde-apps/ktp-send-file/ktp-send-file-16.04.3.ebuild
+++ b/kde-apps/ktp-send-file/ktp-send-file-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy file manager plugin to send files to contacts"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/ktp-text-ui/ktp-text-ui-16.04.3.ebuild b/kde-apps/ktp-text-ui/ktp-text-ui-16.04.3.ebuild
index 9a9d1c14ff09..43c18a9c3bbf 100644
--- a/kde-apps/ktp-text-ui/ktp-text-ui-16.04.3.ebuild
+++ b/kde-apps/ktp-text-ui/ktp-text-ui-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="KDE Telepathy text chat window"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="speech"
 
 DEPEND="
diff --git a/kde-apps/ktraderclient/ktraderclient-16.04.3.ebuild b/kde-apps/ktraderclient/ktraderclient-16.04.3.ebuild
index d4cd91be3789..2dc44b1d6e77 100644
--- a/kde-apps/ktraderclient/ktraderclient-16.04.3.ebuild
+++ b/kde-apps/ktraderclient/ktraderclient-16.04.3.ebuild
@@ -9,4 +9,4 @@ inherit kde4-meta
 
 DESCRIPTION="A command-line tool for querying the KDE trader system"
 IUSE="debug"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
diff --git a/kde-apps/ktuberling/ktuberling-16.04.3.ebuild b/kde-apps/ktuberling/ktuberling-16.04.3.ebuild
index 0d9dedde7463..a48f9f9aeab4 100644
--- a/kde-apps/ktuberling/ktuberling-16.04.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ktuberling/
 	https://games.kde.org/game.php?game=ktuberling
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kturtle/kturtle-16.04.3.ebuild b/kde-apps/kturtle/kturtle-16.04.3.ebuild
index 3a680b9550b9..739f34aa6ceb 100644
--- a/kde-apps/kturtle/kturtle-16.04.3.ebuild
+++ b/kde-apps/kturtle/kturtle-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Educational programming environment using the Logo programming language"
 HOMEPAGE="https://www.kde.org/applications/education/kturtle https://edu.kde.org/kturtle"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kubrick/kubrick-16.04.3.ebuild b/kde-apps/kubrick/kubrick-16.04.3.ebuild
index 18eca9247933..9bc1dcf9b687 100644
--- a/kde-apps/kubrick/kubrick-16.04.3.ebuild
+++ b/kde-apps/kubrick/kubrick-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
 
 DESCRIPTION="A game based on the \"Rubik's Cube\" puzzle"
 HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="$(add_kdeapps_dep libkdegames)
diff --git a/kde-apps/kuiserver/kuiserver-16.04.3.ebuild b/kde-apps/kuiserver/kuiserver-16.04.3.ebuild
index a63834c86bfd..a450205bc865 100644
--- a/kde-apps/kuiserver/kuiserver-16.04.3.ebuild
+++ b/kde-apps/kuiserver/kuiserver-16.04.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/kurifilter-plugins/kurifilter-plugins-16.04.3.ebuild b/kde-apps/kurifilter-plugins/kurifilter-plugins-16.04.3.ebuild
index 896a24799530..f4f18458fa4f 100644
--- a/kde-apps/kurifilter-plugins/kurifilter-plugins-16.04.3.ebuild
+++ b/kde-apps/kurifilter-plugins/kurifilter-plugins-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Plugins to manage filtering URIs"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RESTRICT=test
diff --git a/kde-apps/kuser/kuser-16.04.3.ebuild b/kde-apps/kuser/kuser-16.04.3.ebuild
index ded9c338fc28..44123a465429 100644
--- a/kde-apps/kuser/kuser-16.04.3.ebuild
+++ b/kde-apps/kuser/kuser-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE application that helps you manage system users"
 HOMEPAGE="https://www.kde.org/applications/system/kuser/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kwalletd/kwalletd-16.04.3.ebuild b/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
index 7ff12e9eee4b..f50554e045c3 100644
--- a/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
+++ b/kde-apps/kwalletd/kwalletd-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug gpg"
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-16.04.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-16.04.3.ebuild
index 7f1b1d224d6b..7eb4bbfd656e 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-16.04.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-16.04.3.ebuild
@@ -9,7 +9,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE Wallet management tool"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwordquiz/kwordquiz-16.04.3.ebuild b/kde-apps/kwordquiz/kwordquiz-16.04.3.ebuild
index 51bf2275e795..9b6e20d80b3c 100644
--- a/kde-apps/kwordquiz/kwordquiz-16.04.3.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="A powerful flashcard and vocabulary learning program"
 HOMEPAGE="https://www.kde.org/applications/education/kwordquiz https://edu.kde.org/kwordquiz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kwrite/kwrite-16.04.3.ebuild b/kde-apps/kwrite/kwrite-16.04.3.ebuild
index f23e4006fe52..cf44bd00941a 100644
--- a/kde-apps/kwrite/kwrite-16.04.3.ebuild
+++ b/kde-apps/kwrite/kwrite-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KDE simple text editor"
 HOMEPAGE="https://www.kde.org/applications/utilities/kwrite"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
diff --git a/kde-apps/libkcddb/libkcddb-16.04.3.ebuild b/kde-apps/libkcddb/libkcddb-16.04.3.ebuild
index 634dafd71432..8ab5e436a1ad 100644
--- a/kde-apps/libkcddb/libkcddb-16.04.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug musicbrainz"
 
 # tests require network access and compare static data with online data
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-16.04.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-16.04.3.ebuild
index 0d0542ab8a16..8c2dcd6c9962 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-16.04.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="alsa debug"
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-16.04.3.ebuild b/kde-apps/libkdcraw/libkdcraw-16.04.3.ebuild
index 8f5539b2b3df..6256a484f168 100644
--- a/kde-apps/libkdcraw/libkdcraw-16.04.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Digital camera raw image library wrapper"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-16.04.3.ebuild b/kde-apps/libkdegames/libkdegames-16.04.3.ebuild
index 12fb16ff89ea..5baba831a6f0 100644
--- a/kde-apps/libkdegames/libkdegames-16.04.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-16.04.3.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-16.04.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-16.04.3.ebuild
index 334773d2a32b..ebd299e34d01 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-16.04.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Library for reading/writing KVTML"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkexiv2/libkexiv2-16.04.3.ebuild b/kde-apps/libkexiv2/libkexiv2-16.04.3.ebuild
index bdf48918be69..0b6e5fbb35d3 100644
--- a/kde-apps/libkexiv2/libkexiv2-16.04.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+xmp"
 
 DEPEND="
diff --git a/kde-apps/libkface/libkface-16.04.3.ebuild b/kde-apps/libkface/libkface-16.04.3.ebuild
index 847d330aa4a4..d5761225692d 100644
--- a/kde-apps/libkface/libkface-16.04.3.ebuild
+++ b/kde-apps/libkface/libkface-16.04.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt/C++ wrapper around LibFace to perform face recognition and detec
 HOMEPAGE="https://projects.kde.org/projects/kde/kdegraphics/libs/libkface"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkgeomap/libkgeomap-16.04.3.ebuild b/kde-apps/libkgeomap/libkgeomap-16.04.3.ebuild
index 1dc3edf50818..211d16599eed 100644
--- a/kde-apps/libkgeomap/libkgeomap-16.04.3.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-16.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Wrapper library for world map components as marble, openstreetmap a
 HOMEPAGE="https://www.digikam.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkipi/libkipi-16.04.3.ebuild b/kde-apps/libkipi/libkipi-16.04.3.ebuild
index 4f51857f2a66..b8dcbffa0094 100644
--- a/kde-apps/libkipi/libkipi-16.04.3.ebuild
+++ b/kde-apps/libkipi/libkipi-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="A library for image plugins accross KDE applications"
 SLOT="5/31"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-16.04.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-16.04.3.ebuild
index 178c494cd028..000e66edc427 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-16.04.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-16.04.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-16.04.3.ebuild
index 3d9b72145207..1a0989cc9ce4 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-16.04.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkonq/libkonq-16.04.3.ebuild b/kde-apps/libkonq/libkonq-16.04.3.ebuild
index 7b4eb2ca327c..93feec02d4eb 100644
--- a/kde-apps/libkonq/libkonq-16.04.3.ebuild
+++ b/kde-apps/libkonq/libkonq-16.04.3.ebuild
@@ -10,7 +10,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 RESTRICT="test"
 
diff --git a/kde-apps/libksane/libksane-16.04.3.ebuild b/kde-apps/libksane/libksane-16.04.3.ebuild
index b047689d1685..71fa539f43f9 100644
--- a/kde-apps/libksane/libksane-16.04.3.ebuild
+++ b/kde-apps/libksane/libksane-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="SANE Library interface based on KDE Frameworks"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="LGPL-2"
 
diff --git a/kde-apps/lokalize/lokalize-16.04.3.ebuild b/kde-apps/lokalize/lokalize-16.04.3.ebuild
index 5f130e7aad79..f1c0d2c81ea2 100644
--- a/kde-apps/lokalize/lokalize-16.04.3.ebuild
+++ b/kde-apps/lokalize/lokalize-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit python-single-r1 kde5
 DESCRIPTION="KDE Applications 5 translation tool"
 HOMEPAGE="https://www.kde.org/applications/development/lokalize
 http://l10n.kde.org/tools"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/lskat/lskat-16.04.3.ebuild b/kde-apps/lskat/lskat-16.04.3.ebuild
index ecf35fb2aa93..325ece198a50 100644
--- a/kde-apps/lskat/lskat-16.04.3.ebuild
+++ b/kde-apps/lskat/lskat-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/lskat/
 	https://games.kde.org/game.php?game=lskat
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/marble/marble-16.04.3.ebuild b/kde-apps/marble/marble-16.04.3.ebuild
index 1dbf79454b66..1e82d0ee8048 100644
--- a/kde-apps/marble/marble-16.04.3.ebuild
+++ b/kde-apps/marble/marble-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 
 IUSE="aprs designer-plugin gps +kde phonon shapefile"
 
diff --git a/kde-apps/minuet/minuet-16.04.3.ebuild b/kde-apps/minuet/minuet-16.04.3.ebuild
index 69cb171e7f6d..d021e6f69f5b 100644
--- a/kde-apps/minuet/minuet-16.04.3.ebuild
+++ b/kde-apps/minuet/minuet-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="A KDE Software for Music Education"
 HOMEPAGE="https://minuet.kde.org/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/nsplugins/nsplugins-16.04.3.ebuild b/kde-apps/nsplugins/nsplugins-16.04.3.ebuild
index 12258e1c94d4..d07b7f74dc61 100644
--- a/kde-apps/nsplugins/nsplugins-16.04.3.ebuild
+++ b/kde-apps/nsplugins/nsplugins-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta pax-utils
 
 DESCRIPTION="Netscape plugins support for Konqueror"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/okteta/okteta-16.04.3.ebuild b/kde-apps/okteta/okteta-16.04.3.ebuild
index eb0325a91f7b..ddb6865edc55 100644
--- a/kde-apps/okteta/okteta-16.04.3.ebuild
+++ b/kde-apps/okteta/okteta-16.04.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="KDE hexeditor"
 HOMEPAGE="https://www.kde.org/applications/utilities/okteta
 https://utils.kde.org/projects/okteta"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="crypt examples"
 
 DEPEND="
diff --git a/kde-apps/okular/okular-16.04.3.ebuild b/kde-apps/okular/okular-16.04.3.ebuild
index b76acd413ac2..bc395650d232 100644
--- a/kde-apps/okular/okular-16.04.3.ebuild
+++ b/kde-apps/okular/okular-16.04.3.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base
 
 DESCRIPTION="Universal document viewer based on KPDF"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
diff --git a/kde-apps/palapeli/palapeli-16.04.3.ebuild b/kde-apps/palapeli/palapeli-16.04.3.ebuild
index bce74e6f9b33..ca605d497506 100644
--- a/kde-apps/palapeli/palapeli-16.04.3.ebuild
+++ b/kde-apps/palapeli/palapeli-16.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE jigsaw puzzle game"
 HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/parley/parley-16.04.3.ebuild b/kde-apps/parley/parley-16.04.3.ebuild
index e268d9b1e2a3..9433b2f79fd2 100644
--- a/kde-apps/parley/parley-16.04.3.ebuild
+++ b/kde-apps/parley/parley-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="A vocabulary trainer to help you memorize things"
 HOMEPAGE="https://www.kde.org/applications/education/parley
 https://edu.kde.org/applications/school/parley"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild b/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild
index 2b3e9007bf48..9bbb802a4a74 100644
--- a/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild
+++ b/kde-apps/phonon-kde/phonon-kde-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Phonon KDE Integration"
 HOMEPAGE="https://phonon.kde.org"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="alsa debug pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/picmi/picmi-16.04.3.ebuild b/kde-apps/picmi/picmi-16.04.3.ebuild
index a1a10e3d8807..ddbc8655c9bd 100644
--- a/kde-apps/picmi/picmi-16.04.3.ebuild
+++ b/kde-apps/picmi/picmi-16.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Nonogram logic game by KDE"
 HOMEPAGE="https://games.kde.org/game.php?game=picmi"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/plasma-apps/plasma-apps-16.04.3.ebuild b/kde-apps/plasma-apps/plasma-apps-16.04.3.ebuild
index 694ebef83588..3c4f7cd98aca 100644
--- a/kde-apps/plasma-apps/plasma-apps-16.04.3.ebuild
+++ b/kde-apps/plasma-apps/plasma-apps-16.04.3.ebuild
@@ -9,7 +9,7 @@ KMMODULE="plasma"
 inherit kde4-meta
 
 DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild b/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild
index a19e010b718e..535f01b484a9 100644
--- a/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild
+++ b/kde-apps/plasma-runtime/plasma-runtime-16.04.3.ebuild
@@ -11,7 +11,7 @@ WEBKIT_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.04.3.ebuild b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.04.3.ebuild
index 7bde3ba5b12f..19188a8c7213 100644
--- a/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.04.3.ebuild
+++ b/kde-apps/plasma-telepathy-meta/plasma-telepathy-meta-16.04.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Plasma Telepathy client"
 HOMEPAGE="https://community.kde.org/Real-Time_Communication_and_Collaboration"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gstreamer nls"
 
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/poxml/poxml-16.04.3.ebuild b/kde-apps/poxml/poxml-16.04.3.ebuild
index c8341106cdb3..f7dd906d8a02 100644
--- a/kde-apps/poxml/poxml-16.04.3.ebuild
+++ b/kde-apps/poxml/poxml-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/print-manager/print-manager-16.04.3.ebuild b/kde-apps/print-manager/print-manager-16.04.3.ebuild
index f408c186d985..7ba5978c441a 100644
--- a/kde-apps/print-manager/print-manager-16.04.3.ebuild
+++ b/kde-apps/print-manager/print-manager-16.04.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde5
 
 DESCRIPTION="Manage print jobs and printers in Plasma"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gtk"
 
 DEPEND="
diff --git a/kde-apps/renamedlg-plugins/renamedlg-plugins-16.04.3.ebuild b/kde-apps/renamedlg-plugins/renamedlg-plugins-16.04.3.ebuild
index db68ca06d835..829969d1bc33 100644
--- a/kde-apps/renamedlg-plugins/renamedlg-plugins-16.04.3.ebuild
+++ b/kde-apps/renamedlg-plugins/renamedlg-plugins-16.04.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="renamedlgplugins"
 inherit kde4-meta
 
 DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/rocs/rocs-16.04.3.ebuild b/kde-apps/rocs/rocs-16.04.3.ebuild
index 67b246e1ed14..38ff889e625c 100644
--- a/kde-apps/rocs/rocs-16.04.3.ebuild
+++ b/kde-apps/rocs/rocs-16.04.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Interface to work with Graph Theory"
 HOMEPAGE="https://www.kde.org/applications/education/rocs
 https://edu.kde.org/applications/mathematics/rocs"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.3.ebuild b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.3.ebuild
index e229e2ee01b7..974e5a1cb514 100644
--- a/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.3.ebuild
+++ b/kde-apps/signon-kwallet-extension/signon-kwallet-extension-16.04.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KWallet extension for signond"
 HOMEPAGE="https://01.org/gsso/"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="LGPL-2.1"
 
 DEPEND="
diff --git a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild
index 409b91d27a03..44bbb054b723 100644
--- a/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
 HOMEPAGE="https://solid.kde.org"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug bluetooth networkmanager"
 
 KMEXTRA="
diff --git a/kde-apps/spectacle/spectacle-16.04.3.ebuild b/kde-apps/spectacle/spectacle-16.04.3.ebuild
index 513119e41de5..cc6c2f19490e 100644
--- a/kde-apps/spectacle/spectacle-16.04.3.ebuild
+++ b/kde-apps/spectacle/spectacle-16.04.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Screenshot capture utility"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kipi share"
 
 DEPEND="
diff --git a/kde-apps/step/step-16.04.3.ebuild b/kde-apps/step/step-16.04.3.ebuild
index 9f7e8be5f9d4..0bbec31d8326 100644
--- a/kde-apps/step/step-16.04.3.ebuild
+++ b/kde-apps/step/step-16.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Interactive physics simulator"
 HOMEPAGE="https://edu.kde.org/step"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+gsl +qalculate"
 
 DEPEND="
diff --git a/kde-apps/svgpart/svgpart-16.04.3.ebuild b/kde-apps/svgpart/svgpart-16.04.3.ebuild
index c659b70806fe..19217a819528 100644
--- a/kde-apps/svgpart/svgpart-16.04.3.ebuild
+++ b/kde-apps/svgpart/svgpart-16.04.3.ebuild
@@ -7,5 +7,5 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/sweeper/sweeper-16.04.3.ebuild b/kde-apps/sweeper/sweeper-16.04.3.ebuild
index 9e8d9cce01e7..cc62451103d9 100644
--- a/kde-apps/sweeper/sweeper-16.04.3.ebuild
+++ b/kde-apps/sweeper/sweeper-16.04.3.ebuild
@@ -10,5 +10,5 @@ inherit kde4-base
 DESCRIPTION="KDE Privacy Settings Widget"
 HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
 https://utils.kde.org/projects/sweeper"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/thumbnailers/thumbnailers-16.04.3.ebuild b/kde-apps/thumbnailers/thumbnailers-16.04.3.ebuild
index 7a0aaeea3898..da62e1eb41a8 100644
--- a/kde-apps/thumbnailers/thumbnailers-16.04.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-16.04.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kdegraphics-thumbnailers"
 inherit kde5
 
 DESCRIPTION="Thumbnail generators for PDF/PS and RAW files"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/umbrello/umbrello-16.04.3.ebuild b/kde-apps/umbrello/umbrello-16.04.3.ebuild
index b85d5b377c15..79503bb3c154 100644
--- a/kde-apps/umbrello/umbrello-16.04.3.ebuild
+++ b/kde-apps/umbrello/umbrello-16.04.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/development/umbrello
 	https://umbrello.kde.org
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.04.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.04.3.ebuild
index e3e71f287450..bc0c57a5a028 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.04.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-16.04.3.ebuild
@@ -7,5 +7,5 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"