From 0a1c7f5d6e18c2a80f8a683bcdc4291c7c3ad767 Mon Sep 17 00:00:00 2001
From: Michael Palimaka <kensington@gentoo.org>
Date: Thu, 23 Jun 2016 23:35:19 +1000
Subject: [PATCH] kde-apps: stabilise 15.12.3 on x86

Gentoo-bug: 579992

Package-Manager: portage-2.3.0_rc1
---
 kde-apps/analitza/analitza-15.12.3.ebuild                       | 2 +-
 kde-apps/ark/ark-15.12.3.ebuild                                 | 2 +-
 kde-apps/artikulate/artikulate-15.12.3.ebuild                   | 2 +-
 kde-apps/attica/attica-15.12.3.ebuild                           | 2 +-
 kde-apps/audiocd-kio/audiocd-kio-15.12.3.ebuild                 | 2 +-
 kde-apps/baloo-widgets/baloo-widgets-15.12.3.ebuild             | 2 +-
 kde-apps/blinken/blinken-15.12.3.ebuild                         | 2 +-
 kde-apps/bomber/bomber-15.12.3.ebuild                           | 2 +-
 kde-apps/bovo/bovo-15.12.3.ebuild                               | 2 +-
 kde-apps/cantor/cantor-15.12.3-r1.ebuild                        | 2 +-
 kde-apps/cervisia/cervisia-15.12.3.ebuild                       | 2 +-
 kde-apps/dolphin-plugins/dolphin-plugins-15.12.3.ebuild         | 2 +-
 kde-apps/dolphin/dolphin-15.12.3-r1.ebuild                      | 2 +-
 kde-apps/dragon/dragon-15.12.3.ebuild                           | 2 +-
 kde-apps/drkonqi/drkonqi-15.12.3.ebuild                         | 2 +-
 kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.3.ebuild               | 2 +-
 kde-apps/filelight/filelight-15.12.3.ebuild                     | 2 +-
 kde-apps/granatier/granatier-15.12.3.ebuild                     | 2 +-
 kde-apps/gwenview/gwenview-15.12.3.ebuild                       | 2 +-
 kde-apps/jovie/jovie-15.12.3.ebuild                             | 2 +-
 kde-apps/juk/juk-15.12.3.ebuild                                 | 2 +-
 kde-apps/kaccessible/kaccessible-15.12.3.ebuild                 | 2 +-
 .../kaccounts-integration/kaccounts-integration-15.12.3.ebuild  | 2 +-
 kde-apps/kajongg/kajongg-15.12.3.ebuild                         | 2 +-
 kde-apps/kalgebra/kalgebra-15.12.3.ebuild                       | 2 +-
 kde-apps/kalzium/kalzium-15.12.3-r2.ebuild                      | 2 +-
 kde-apps/kamera/kamera-15.12.3.ebuild                           | 2 +-
 kde-apps/kanagram/kanagram-15.12.3.ebuild                       | 2 +-
 kde-apps/kapman/kapman-15.12.3.ebuild                           | 2 +-
 kde-apps/kapptemplate/kapptemplate-15.12.3-r1.ebuild            | 2 +-
 kde-apps/kate/kate-15.12.3.ebuild                               | 2 +-
 kde-apps/katomic/katomic-15.12.3.ebuild                         | 2 +-
 kde-apps/kblackbox/kblackbox-15.12.3.ebuild                     | 2 +-
 kde-apps/kblocks/kblocks-15.12.3-r1.ebuild                      | 2 +-
 kde-apps/kbounce/kbounce-15.12.3.ebuild                         | 2 +-
 kde-apps/kbreakout/kbreakout-15.12.3.ebuild                     | 2 +-
 kde-apps/kbruch/kbruch-15.12.3-r1.ebuild                        | 2 +-
 kde-apps/kcachegrind/kcachegrind-15.12.3.ebuild                 | 2 +-
 kde-apps/kcalc/kcalc-15.12.3-r1.ebuild                          | 2 +-
 kde-apps/kcharselect/kcharselect-15.12.3.ebuild                 | 2 +-
 kde-apps/kcmshell/kcmshell-15.12.3.ebuild                       | 2 +-
 kde-apps/kcolorchooser/kcolorchooser-15.12.3.ebuild             | 2 +-
 kde-apps/kcontrol/kcontrol-15.12.3.ebuild                       | 2 +-
 kde-apps/kcron/kcron-15.12.3.ebuild                             | 2 +-
 kde-apps/kde-apps-meta/kde-apps-meta-15.12.3-r3.ebuild          | 2 +-
 kde-apps/kde-dev-scripts/kde-dev-scripts-15.12.3.ebuild         | 2 +-
 kde-apps/kde-dev-utils/kde-dev-utils-15.12.3.ebuild             | 2 +-
 kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild                    | 2 +-
 kde-apps/kde-meta/kde-meta-15.12.3.ebuild                       | 2 +-
 kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild                  | 2 +-
 .../kdeaccessibility-meta/kdeaccessibility-meta-15.12.3.ebuild  | 2 +-
 kde-apps/kdeadmin-meta/kdeadmin-meta-15.12.3.ebuild             | 2 +-
 kde-apps/kdebase-data/kdebase-data-15.12.3.ebuild               | 2 +-
 .../kdebase-desktoptheme/kdebase-desktoptheme-15.12.3.ebuild    | 2 +-
 kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild     | 2 +-
 kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.12.3.ebuild   | 2 +-
 kde-apps/kdebase-menu/kdebase-menu-15.12.3.ebuild               | 2 +-
 kde-apps/kdebase-meta/kdebase-meta-15.12.3.ebuild               | 2 +-
 .../kdebase-runtime-meta/kdebase-runtime-meta-15.12.3.ebuild    | 2 +-
 kde-apps/kdebugdialog/kdebugdialog-15.12.3.ebuild               | 2 +-
 kde-apps/kdebugsettings/kdebugsettings-15.12.3.ebuild           | 2 +-
 kde-apps/kdecore-meta/kdecore-meta-15.12.3.ebuild               | 2 +-
 kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.ebuild              | 2 +-
 kde-apps/kdeedu-meta/kdeedu-meta-15.12.3-r1.ebuild              | 2 +-
 kde-apps/kdegames-meta/kdegames-meta-15.12.3.ebuild             | 2 +-
 kde-apps/kdegraphics-meta/kdegraphics-meta-15.12.3.ebuild       | 2 +-
 .../kdegraphics-mobipocket-15.12.3-r1.ebuild                    | 2 +-
 kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.3.ebuild   | 2 +-
 .../kdenetwork-filesharing-15.12.3.ebuild                       | 2 +-
 kde-apps/kdenetwork-meta/kdenetwork-meta-15.12.3-r1.ebuild      | 2 +-
 kde-apps/kdenlive/kdenlive-15.12.3.ebuild                       | 2 +-
 kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild                     | 2 +-
 kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild                 | 2 +-
 kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.12.3.ebuild       | 2 +-
 kde-apps/kdesdk-meta/kdesdk-meta-15.12.3.ebuild                 | 2 +-
 kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.3.ebuild | 2 +-
 kde-apps/kdesu/kdesu-15.12.3.ebuild                             | 2 +-
 kde-apps/kdeutils-meta/kdeutils-meta-15.12.3.ebuild             | 2 +-
 kde-apps/kdewebdev-meta/kdewebdev-meta-15.12.3.ebuild           | 2 +-
 kde-apps/kdf/kdf-15.12.3.ebuild                                 | 2 +-
 kde-apps/kdialog/kdialog-15.12.3.ebuild                         | 2 +-
 kde-apps/kdiamond/kdiamond-15.12.3.ebuild                       | 2 +-
 .../kdontchangethehostname-15.12.3.ebuild                       | 2 +-
 kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild           | 2 +-
 kde-apps/keditfiletype/keditfiletype-15.12.3.ebuild             | 2 +-
 kde-apps/kfile/kfile-15.12.3.ebuild                             | 2 +-
 kde-apps/kfilereplace/kfilereplace-15.12.3.ebuild               | 2 +-
 kde-apps/kfind/kfind-15.12.3.ebuild                             | 2 +-
 kde-apps/kfloppy/kfloppy-15.12.3.ebuild                         | 2 +-
 kde-apps/kfmclient/kfmclient-15.12.3.ebuild                     | 2 +-
 kde-apps/kfourinline/kfourinline-15.12.3-r1.ebuild              | 2 +-
 kde-apps/kgeography/kgeography-15.12.3.ebuild                   | 2 +-
 kde-apps/kget/kget-15.12.3.ebuild                               | 2 +-
 kde-apps/kglobalaccel/kglobalaccel-15.12.3.ebuild               | 2 +-
 kde-apps/kgoldrunner/kgoldrunner-15.12.3.ebuild                 | 2 +-
 kde-apps/kgpg/kgpg-15.12.3.ebuild                               | 2 +-
 kde-apps/khangman/khangman-15.12.3.ebuild                       | 2 +-
 kde-apps/kiconfinder/kiconfinder-15.12.3.ebuild                 | 2 +-
 kde-apps/kig/kig-15.12.3.ebuild                                 | 2 +-
 kde-apps/kigo/kigo-15.12.3.ebuild                               | 2 +-
 kde-apps/killbots/killbots-15.12.3.ebuild                       | 2 +-
 kde-apps/kimagemapeditor/kimagemapeditor-15.12.3.ebuild         | 2 +-
 kde-apps/kimgio/kimgio-15.12.3.ebuild                           | 2 +-
 kde-apps/kioclient/kioclient-15.12.3.ebuild                     | 2 +-
 kde-apps/kiriki/kiriki-15.12.3.ebuild                           | 2 +-
 kde-apps/kiten/kiten-15.12.3.ebuild                             | 2 +-
 kde-apps/kjumpingcube/kjumpingcube-15.12.3-r1.ebuild            | 2 +-
 kde-apps/klettres/klettres-15.12.3.ebuild                       | 2 +-
 kde-apps/klickety/klickety-15.12.3.ebuild                       | 2 +-
 kde-apps/klines/klines-15.12.3.ebuild                           | 2 +-
 kde-apps/klinkstatus/klinkstatus-15.12.3.ebuild                 | 2 +-
 kde-apps/kmag/kmag-15.12.3.ebuild                               | 2 +-
 kde-apps/kmahjongg/kmahjongg-15.12.3.ebuild                     | 2 +-
 kde-apps/kmimetypefinder/kmimetypefinder-15.12.3.ebuild         | 2 +-
 kde-apps/kmines/kmines-15.12.3-r1.ebuild                        | 2 +-
 kde-apps/kmix/kmix-15.12.3.ebuild                               | 2 +-
 kde-apps/kmousetool/kmousetool-15.12.3.ebuild                   | 2 +-
 kde-apps/kmouth/kmouth-15.12.3.ebuild                           | 2 +-
 kde-apps/kmplot/kmplot-15.12.3.ebuild                           | 2 +-
 kde-apps/knavalbattle/knavalbattle-15.12.3.ebuild               | 2 +-
 kde-apps/knetattach/knetattach-15.12.3.ebuild                   | 2 +-
 kde-apps/knetwalk/knetwalk-15.12.3-r1.ebuild                    | 2 +-
 kde-apps/knewstuff/knewstuff-15.12.3.ebuild                     | 2 +-
 kde-apps/knotify/knotify-15.12.3.ebuild                         | 2 +-
 kde-apps/kolf/kolf-15.12.3.ebuild                               | 2 +-
 kde-apps/kollision/kollision-15.12.3-r1.ebuild                  | 2 +-
 kde-apps/kolourpaint/kolourpaint-15.12.3.ebuild                 | 2 +-
 kde-apps/kommander/kommander-15.12.3.ebuild                     | 2 +-
 kde-apps/kompare/kompare-15.12.3.ebuild                         | 2 +-
 kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild               | 2 +-
 kde-apps/konqueror/konqueror-15.12.3.ebuild                     | 2 +-
 kde-apps/konquest/konquest-15.12.3.ebuild                       | 2 +-
 kde-apps/konsole/konsole-15.12.3.ebuild                         | 2 +-
 kde-apps/kopete/kopete-15.12.3.ebuild                           | 2 +-
 kde-apps/kpasswdserver/kpasswdserver-15.12.3.ebuild             | 2 +-
 kde-apps/kpat/kpat-15.12.3-r1.ebuild                            | 2 +-
 kde-apps/kppp/kppp-15.12.3.ebuild                               | 2 +-
 kde-apps/kqtquickcharts/kqtquickcharts-15.12.3.ebuild           | 2 +-
 kde-apps/kquitapp/kquitapp-15.12.3.ebuild                       | 2 +-
 kde-apps/krdc/krdc-15.12.3.ebuild                               | 2 +-
 kde-apps/kreadconfig/kreadconfig-15.12.3.ebuild                 | 2 +-
 kde-apps/kremotecontrol/kremotecontrol-15.12.3.ebuild           | 2 +-
 kde-apps/kreversi/kreversi-15.12.3.ebuild                       | 2 +-
 kde-apps/krfb/krfb-15.12.3.ebuild                               | 2 +-
 kde-apps/kruler/kruler-15.12.3.ebuild                           | 2 +-
 kde-apps/ksaneplugin/ksaneplugin-15.12.3.ebuild                 | 2 +-
 kde-apps/kscd/kscd-15.12.3.ebuild                               | 2 +-
 kde-apps/kshisen/kshisen-15.12.3.ebuild                         | 2 +-
 kde-apps/ksirk/ksirk-15.12.3.ebuild                             | 2 +-
 kde-apps/ksnakeduel/ksnakeduel-15.12.3.ebuild                   | 2 +-
 kde-apps/kspaceduel/kspaceduel-15.12.3.ebuild                   | 2 +-
 kde-apps/ksquares/ksquares-15.12.3.ebuild                       | 2 +-
 kde-apps/kstars/kstars-15.12.3.ebuild                           | 2 +-
 kde-apps/kstart/kstart-15.12.3.ebuild                           | 2 +-
 kde-apps/ksudoku/ksudoku-15.12.3.ebuild                         | 2 +-
 kde-apps/ksystemlog/ksystemlog-15.12.3.ebuild                   | 2 +-
 kde-apps/kteatime/kteatime-15.12.3.ebuild                       | 2 +-
 kde-apps/ktimer/ktimer-15.12.3.ebuild                           | 2 +-
 kde-apps/ktimezoned/ktimezoned-15.12.3.ebuild                   | 2 +-
 kde-apps/ktouch/ktouch-15.12.3.ebuild                           | 2 +-
 kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild                       | 2 +-
 kde-apps/ktraderclient/ktraderclient-15.12.3.ebuild             | 2 +-
 kde-apps/ktuberling/ktuberling-15.12.3.ebuild                   | 2 +-
 kde-apps/kturtle/kturtle-15.12.3.ebuild                         | 2 +-
 kde-apps/kubrick/kubrick-15.12.3.ebuild                         | 2 +-
 kde-apps/kuiserver/kuiserver-15.12.3.ebuild                     | 2 +-
 kde-apps/kurifilter-plugins/kurifilter-plugins-15.12.3.ebuild   | 2 +-
 kde-apps/kuser/kuser-15.12.3.ebuild                             | 2 +-
 kde-apps/kwalletd/kwalletd-15.12.3.ebuild                       | 2 +-
 kde-apps/kwalletmanager/kwalletmanager-15.12.3.ebuild           | 2 +-
 kde-apps/kwordquiz/kwordquiz-15.12.3-r1.ebuild                  | 2 +-
 kde-apps/kwrite/kwrite-15.12.3.ebuild                           | 2 +-
 kde-apps/libkcddb/libkcddb-15.12.3.ebuild                       | 2 +-
 kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild      | 2 +-
 kde-apps/libkdcraw/libkdcraw-15.12.3.ebuild                     | 2 +-
 kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild                     | 2 +-
 kde-apps/libkdegames/libkdegames-15.12.3.ebuild                 | 2 +-
 kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.3.ebuild   | 2 +-
 kde-apps/libkexiv2/libkexiv2-15.12.3.ebuild                     | 2 +-
 kde-apps/libkipi/libkipi-15.12.3.ebuild                         | 2 +-
 kde-apps/libkmahjongg/libkmahjongg-15.12.3.ebuild               | 2 +-
 kde-apps/libkomparediff2/libkomparediff2-15.12.3.ebuild         | 2 +-
 kde-apps/libkonq/libkonq-15.12.3.ebuild                         | 2 +-
 kde-apps/libksane/libksane-15.12.3.ebuild                       | 2 +-
 kde-apps/lokalize/lokalize-15.12.3.ebuild                       | 2 +-
 kde-apps/lskat/lskat-15.12.3.ebuild                             | 2 +-
 kde-apps/marble/marble-15.12.3.ebuild                           | 2 +-
 kde-apps/nsplugins/nsplugins-15.12.3.ebuild                     | 2 +-
 kde-apps/okteta/okteta-15.12.3.ebuild                           | 2 +-
 kde-apps/okular/okular-15.12.3.ebuild                           | 2 +-
 kde-apps/palapeli/palapeli-15.12.3.ebuild                       | 2 +-
 kde-apps/parley/parley-15.12.3.ebuild                           | 2 +-
 kde-apps/phonon-kde/phonon-kde-15.12.3.ebuild                   | 2 +-
 kde-apps/picmi/picmi-15.12.3.ebuild                             | 2 +-
 kde-apps/plasma-apps/plasma-apps-15.12.3.ebuild                 | 2 +-
 kde-apps/plasma-runtime/plasma-runtime-15.12.3.ebuild           | 2 +-
 kde-apps/poxml/poxml-15.12.3.ebuild                             | 2 +-
 kde-apps/print-manager/print-manager-15.12.3.ebuild             | 2 +-
 kde-apps/renamedlg-plugins/renamedlg-plugins-15.12.3.ebuild     | 2 +-
 kde-apps/rocs/rocs-15.12.3.ebuild                               | 2 +-
 kde-apps/solid-runtime/solid-runtime-15.12.3.ebuild             | 2 +-
 kde-apps/spectacle/spectacle-15.12.3.ebuild                     | 2 +-
 kde-apps/step/step-15.12.3.ebuild                               | 2 +-
 kde-apps/svgpart/svgpart-15.12.3.ebuild                         | 2 +-
 kde-apps/sweeper/sweeper-15.12.3.ebuild                         | 2 +-
 kde-apps/thumbnailers/thumbnailers-15.12.3.ebuild               | 2 +-
 kde-apps/umbrello/umbrello-15.12.3.ebuild                       | 2 +-
 kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.12.3.ebuild       | 2 +-
 208 files changed, 208 insertions(+), 208 deletions(-)

diff --git a/kde-apps/analitza/analitza-15.12.3.ebuild b/kde-apps/analitza/analitza-15.12.3.ebuild
index d495f6c8fc05..e36289757838 100644
--- a/kde-apps/analitza/analitza-15.12.3.ebuild
+++ b/kde-apps/analitza/analitza-15.12.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-15.12.3.ebuild b/kde-apps/ark/ark-15.12.3.ebuild
index 96c753760401..e9d941433134 100644
--- a/kde-apps/ark/ark-15.12.3.ebuild
+++ b/kde-apps/ark/ark-15.12.3.ebuild
@@ -11,7 +11,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-15.12.3.ebuild b/kde-apps/artikulate/artikulate-15.12.3.ebuild
index cc0374ae73a1..995e248bbc7f 100644
--- a/kde-apps/artikulate/artikulate-15.12.3.ebuild
+++ b/kde-apps/artikulate/artikulate-15.12.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=""
 
 DEPEND="
diff --git a/kde-apps/attica/attica-15.12.3.ebuild b/kde-apps/attica/attica-15.12.3.ebuild
index cf4e23f3e70a..8f0f3935a8a6 100644
--- a/kde-apps/attica/attica-15.12.3.ebuild
+++ b/kde-apps/attica/attica-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-15.12.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-15.12.3.ebuild
index 942e527aa9d0..f3cb50d8d38e 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-15.12.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-15.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug flac vorbis"
 
 DEPEND="
diff --git a/kde-apps/baloo-widgets/baloo-widgets-15.12.3.ebuild b/kde-apps/baloo-widgets/baloo-widgets-15.12.3.ebuild
index 33bdd5ace2dc..e00a8ffec0cb 100644
--- a/kde-apps/baloo-widgets/baloo-widgets-15.12.3.ebuild
+++ b/kde-apps/baloo-widgets/baloo-widgets-15.12.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-15.12.3.ebuild b/kde-apps/blinken/blinken-15.12.3.ebuild
index cb3b2a5e989e..a246e10b46b3 100644
--- a/kde-apps/blinken/blinken-15.12.3.ebuild
+++ b/kde-apps/blinken/blinken-15.12.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-15.12.3.ebuild b/kde-apps/bomber/bomber-15.12.3.ebuild
index 8cc1bed5c07a..66fd2576d771 100644
--- a/kde-apps/bomber/bomber-15.12.3.ebuild
+++ b/kde-apps/bomber/bomber-15.12.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-15.12.3.ebuild b/kde-apps/bovo/bovo-15.12.3.ebuild
index b41e98796277..cbbeee837a0a 100644
--- a/kde-apps/bovo/bovo-15.12.3.ebuild
+++ b/kde-apps/bovo/bovo-15.12.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-15.12.3-r1.ebuild b/kde-apps/cantor/cantor-15.12.3-r1.ebuild
index 1ac89c58aa64..b01bd79affd8 100644
--- a/kde-apps/cantor/cantor-15.12.3-r1.ebuild
+++ b/kde-apps/cantor/cantor-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/cervisia/cervisia-15.12.3.ebuild
index 5f84ae8692e6..49e4e4e42aa3 100644
--- a/kde-apps/cervisia/cervisia-15.12.3.ebuild
+++ b/kde-apps/cervisia/cervisia-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="A KDE CVS frontend"
 HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/dolphin-plugins/dolphin-plugins-15.12.3.ebuild b/kde-apps/dolphin-plugins/dolphin-plugins-15.12.3.ebuild
index 0dcbc4a20456..78dd5442de50 100644
--- a/kde-apps/dolphin-plugins/dolphin-plugins-15.12.3.ebuild
+++ b/kde-apps/dolphin-plugins/dolphin-plugins-15.12.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-15.12.3-r1.ebuild b/kde-apps/dolphin/dolphin-15.12.3-r1.ebuild
index 61cac7512369..95d65c07b99d 100644
--- a/kde-apps/dolphin/dolphin-15.12.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/dragon/dragon-15.12.3.ebuild
index 4bc8d96db15e..39596aaad045 100644
--- a/kde-apps/dragon/dragon-15.12.3.ebuild
+++ b/kde-apps/dragon/dragon-15.12.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-15.12.3.ebuild b/kde-apps/drkonqi/drkonqi-15.12.3.ebuild
index 086ed5f3b9dd..44ab5b75aa27 100644
--- a/kde-apps/drkonqi/drkonqi-15.12.3.ebuild
+++ b/kde-apps/drkonqi/drkonqi-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.3.ebuild
index dd22793c7e9c..b91f38d4c55d 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.12.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-15.12.3.ebuild b/kde-apps/filelight/filelight-15.12.3.ebuild
index 673364044fb7..41ac477f33f4 100644
--- a/kde-apps/filelight/filelight-15.12.3.ebuild
+++ b/kde-apps/filelight/filelight-15.12.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/granatier/granatier-15.12.3.ebuild b/kde-apps/granatier/granatier-15.12.3.ebuild
index bb7eac9ba36b..ab698cf126ca 100644
--- a/kde-apps/granatier/granatier-15.12.3.ebuild
+++ b/kde-apps/granatier/granatier-15.12.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-15.12.3.ebuild b/kde-apps/gwenview/gwenview-15.12.3.ebuild
index aedcaebb3e01..f1591f2f3895 100644
--- a/kde-apps/gwenview/gwenview-15.12.3.ebuild
+++ b/kde-apps/gwenview/gwenview-15.12.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-15.12.3.ebuild b/kde-apps/jovie/jovie-15.12.3.ebuild
index 4b4cccb0d67e..ef7f6ccd6138 100644
--- a/kde-apps/jovie/jovie-15.12.3.ebuild
+++ b/kde-apps/jovie/jovie-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Jovie is a text to speech application"
 HOMEPAGE="https://www.kde.org/applications/utilities/jovie/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/juk/juk-15.12.3.ebuild b/kde-apps/juk/juk-15.12.3.ebuild
index cf8079aa533e..ef590bd3f710 100644
--- a/kde-apps/juk/juk-15.12.3.ebuild
+++ b/kde-apps/juk/juk-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Jukebox and music manager for KDE"
 HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kaccessible/kaccessible-15.12.3.ebuild b/kde-apps/kaccessible/kaccessible-15.12.3.ebuild
index 50b038355739..27062e6c8553 100644
--- a/kde-apps/kaccessible/kaccessible-15.12.3.ebuild
+++ b/kde-apps/kaccessible/kaccessible-15.12.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug +speechd"
 
 DEPEND="speechd? ( app-accessibility/speech-dispatcher )"
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.3.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.3.ebuild
index 0b55d559fd26..233442c0b41b 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.3.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.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/kajongg/kajongg-15.12.3.ebuild b/kde-apps/kajongg/kajongg-15.12.3.ebuild
index d2ae9b4d19a8..f6432ad0eda8 100644
--- a/kde-apps/kajongg/kajongg-15.12.3.ebuild
+++ b/kde-apps/kajongg/kajongg-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalgebra/kalgebra-15.12.3.ebuild b/kde-apps/kalgebra/kalgebra-15.12.3.ebuild
index 0bf0d2292688..a2201d776ff9 100644
--- a/kde-apps/kalgebra/kalgebra-15.12.3.ebuild
+++ b/kde-apps/kalgebra/kalgebra-15.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="MathML-based graph calculator for 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-15.12.3-r2.ebuild b/kde-apps/kalzium/kalzium-15.12.3-r2.ebuild
index fce45f4d2fd4..c33ff9d54ca6 100644
--- a/kde-apps/kalzium/kalzium-15.12.3-r2.ebuild
+++ b/kde-apps/kalzium/kalzium-15.12.3-r2.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base flag-o-matic
 DESCRIPTION="KDE: periodic table of the elements"
 HOMEPAGE="https://www.kde.org/applications/education/kalzium
 https://edu.kde.org/kalzium"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug editor +plasma solver"
 
 DEPEND="
diff --git a/kde-apps/kamera/kamera-15.12.3.ebuild b/kde-apps/kamera/kamera-15.12.3.ebuild
index 8b18677a673d..97b4a4c3e6c0 100644
--- a/kde-apps/kamera/kamera-15.12.3.ebuild
+++ b/kde-apps/kamera/kamera-15.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Plasma integration for gphoto2 cameras"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kanagram/kanagram-15.12.3.ebuild b/kde-apps/kanagram/kanagram-15.12.3.ebuild
index 744a4b183f0e..ff728079bbf0 100644
--- a/kde-apps/kanagram/kanagram-15.12.3.ebuild
+++ b/kde-apps/kanagram/kanagram-15.12.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-15.12.3.ebuild b/kde-apps/kapman/kapman-15.12.3.ebuild
index 08c570d6eba8..89ccb982a5e0 100644
--- a/kde-apps/kapman/kapman-15.12.3.ebuild
+++ b/kde-apps/kapman/kapman-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Pac-Man clone for KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kapman/"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-15.12.3-r1.ebuild b/kde-apps/kapptemplate/kapptemplate-15.12.3-r1.ebuild
index a101b92e64da..c78ed41bc937 100644
--- a/kde-apps/kapptemplate/kapptemplate-15.12.3-r1.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-15.12.3-r1.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kate/kate-15.12.3.ebuild b/kde-apps/kate/kate-15.12.3.ebuild
index 52c24466f638..8951ed17ea2c 100644
--- a/kde-apps/kate/kate-15.12.3.ebuild
+++ b/kde-apps/kate/kate-15.12.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-15.12.3.ebuild b/kde-apps/katomic/katomic-15.12.3.ebuild
index b077c982c5dc..e51991c97e9b 100644
--- a/kde-apps/katomic/katomic-15.12.3.ebuild
+++ b/kde-apps/katomic/katomic-15.12.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-15.12.3.ebuild b/kde-apps/kblackbox/kblackbox-15.12.3.ebuild
index ad75850f3c2a..59c7f8bfee16 100644
--- a/kde-apps/kblackbox/kblackbox-15.12.3.ebuild
+++ b/kde-apps/kblackbox/kblackbox-15.12.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-15.12.3-r1.ebuild b/kde-apps/kblocks/kblocks-15.12.3-r1.ebuild
index 1354a47df70d..84df39d6ada1 100644
--- a/kde-apps/kblocks/kblocks-15.12.3-r1.ebuild
+++ b/kde-apps/kblocks/kblocks-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kbounce/kbounce-15.12.3.ebuild
index 42e1ccea44ef..160eaf4b67d6 100644
--- a/kde-apps/kbounce/kbounce-15.12.3.ebuild
+++ b/kde-apps/kbounce/kbounce-15.12.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-15.12.3.ebuild b/kde-apps/kbreakout/kbreakout-15.12.3.ebuild
index debf3e19407f..21b1bcaea8ec 100644
--- a/kde-apps/kbreakout/kbreakout-15.12.3.ebuild
+++ b/kde-apps/kbreakout/kbreakout-15.12.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-15.12.3-r1.ebuild b/kde-apps/kbruch/kbruch-15.12.3-r1.ebuild
index d7bbeb67b07e..5e4cd6369f21 100644
--- a/kde-apps/kbruch/kbruch-15.12.3-r1.ebuild
+++ b/kde-apps/kbruch/kbruch-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kcachegrind/kcachegrind-15.12.3.ebuild
index 97fe8f333894..ff1211322984 100644
--- a/kde-apps/kcachegrind/kcachegrind-15.12.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kcalc/kcalc-15.12.3-r1.ebuild b/kde-apps/kcalc/kcalc-15.12.3-r1.ebuild
index 92b10900c2bd..5f839b134bae 100644
--- a/kde-apps/kcalc/kcalc-15.12.3-r1.ebuild
+++ b/kde-apps/kcalc/kcalc-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kcharselect/kcharselect-15.12.3.ebuild
index c6f49c974baa..ba6ccb54e399 100644
--- a/kde-apps/kcharselect/kcharselect-15.12.3.ebuild
+++ b/kde-apps/kcharselect/kcharselect-15.12.3.ebuild
@@ -11,7 +11,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-15.12.3.ebuild b/kde-apps/kcmshell/kcmshell-15.12.3.ebuild
index 13405cd70f61..79db181054b7 100644
--- a/kde-apps/kcmshell/kcmshell-15.12.3.ebuild
+++ b/kde-apps/kcmshell/kcmshell-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Utility to host KDE control modules independently of SystemSettings"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-15.12.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-15.12.3.ebuild
index 8bbd9ae424c6..d301620a3d7b 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-15.12.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-15.12.3.ebuild
@@ -8,5 +8,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE color selector/editor"
 HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kcontrol/kcontrol-15.12.3.ebuild b/kde-apps/kcontrol/kcontrol-15.12.3.ebuild
index 4188e54e5971..16acb9d753be 100644
--- a/kde-apps/kcontrol/kcontrol-15.12.3.ebuild
+++ b/kde-apps/kcontrol/kcontrol-15.12.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kcron/kcron-15.12.3.ebuild b/kde-apps/kcron/kcron-15.12.3.ebuild
index fee21afd8958..8cfe7b0041b7 100644
--- a/kde-apps/kcron/kcron-15.12.3.ebuild
+++ b/kde-apps/kcron/kcron-15.12.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-15.12.3-r3.ebuild b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.3-r3.ebuild
index a49e0898e346..af225fdd9429 100644
--- a/kde-apps/kde-apps-meta/kde-apps-meta-15.12.3-r3.ebuild
+++ b/kde-apps/kde-apps-meta/kde-apps-meta-15.12.3-r3.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 minimal nls pim sdk"
 
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kde-dev-scripts/kde-dev-scripts-15.12.3.ebuild b/kde-apps/kde-dev-scripts/kde-dev-scripts-15.12.3.ebuild
index 3ef4f76c9397..44c0f2fcd767 100644
--- a/kde-apps/kde-dev-scripts/kde-dev-scripts-15.12.3.ebuild
+++ b/kde-apps/kde-dev-scripts/kde-dev-scripts-15.12.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-15.12.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-15.12.3.ebuild
index 156f72adf5f1..7507cffed85a 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-15.12.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-15.12.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="KDE Development Utilities"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild b/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild
index 4ca9ca5aadd7..41c76fff8853 100644
--- a/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild
+++ b/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild
@@ -10,7 +10,7 @@ inherit kde5 multibuild
 DESCRIPTION="KDE internationalization package"
 HOMEPAGE="http://l10n.kde.org"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 KHC_PV="5.6.2"
 KHC="khelpcenter-${KHC_PV}"
diff --git a/kde-apps/kde-meta/kde-meta-15.12.3.ebuild b/kde-apps/kde-meta/kde-meta-15.12.3.ebuild
index 00cd959bb23d..04d6e533816e 100644
--- a/kde-apps/kde-meta/kde-meta-15.12.3.ebuild
+++ b/kde-apps/kde-meta/kde-meta-15.12.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-15.12.3-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild
index 5b29ac6962ee..a49561d26fdb 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
 	!<kde-apps/kde-l10n-${PV}
 "
 
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="minimal"
 
 REMOVE_DIRS="${FILESDIR}/${PN}-15.11.90-remove-dirs"
diff --git a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-15.12.3.ebuild b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-15.12.3.ebuild
index 2a631cc17a66..31e186c474fb 100644
--- a/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-15.12.3.ebuild
+++ b/kde-apps/kdeaccessibility-meta/kdeaccessibility-meta-15.12.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-15.12.3.ebuild b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.12.3.ebuild
index d7540f7af171..2fe6d5284fc7 100644
--- a/kde-apps/kdeadmin-meta/kdeadmin-meta-15.12.3.ebuild
+++ b/kde-apps/kdeadmin-meta/kdeadmin-meta-15.12.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-15.12.3.ebuild b/kde-apps/kdebase-data/kdebase-data-15.12.3.ebuild
index 56e137ec3a3c..ec230c219370 100644
--- a/kde-apps/kdebase-data/kdebase-data-15.12.3.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-15.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
 IUSE="+wallpapers"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	x11-themes/hicolor-icon-theme
diff --git a/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.12.3.ebuild b/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.12.3.ebuild
index 2ed987771231..65fc07082e85 100644
--- a/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.12.3.ebuild
+++ b/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.12.3.ebuild
@@ -10,4 +10,4 @@ inherit kde4-meta
 
 DESCRIPTION="Oxygen Plasma 4 desktop theme"
 IUSE=""
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild
index ed9c52e8de56..3aa7f24a8dd8 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.12.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
 KMMODULE="kioslave"
 inherit kde4-meta
 
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 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-15.12.3.ebuild b/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.12.3.ebuild
index a29435133883..bf99914ce1bd 100644
--- a/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.12.3.ebuild
+++ b/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.12.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE menu icons"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/kde-apps/kdebase-menu/kdebase-menu-15.12.3.ebuild b/kde-apps/kdebase-menu/kdebase-menu-15.12.3.ebuild
index 3610b6c665c8..dd702ada9b33 100644
--- a/kde-apps/kdebase-menu/kdebase-menu-15.12.3.ebuild
+++ b/kde-apps/kdebase-menu/kdebase-menu-15.12.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="kde-menu"
 inherit kde4-meta
 
 DESCRIPTION="KDE Menu query tool"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-15.12.3.ebuild b/kde-apps/kdebase-meta/kdebase-meta-15.12.3.ebuild
index c32241cd6de9..cf148b518c89 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-15.12.3.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-15.12.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-15.12.3.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.12.3.ebuild
index 8efec67d1e72..fa0d56495d7a 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.12.3.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+oldwallet pam"
 
 RDEPEND="
diff --git a/kde-apps/kdebugdialog/kdebugdialog-15.12.3.ebuild b/kde-apps/kdebugdialog/kdebugdialog-15.12.3.ebuild
index 8b90c7a32b1c..54ffbb8cbb95 100644
--- a/kde-apps/kdebugdialog/kdebugdialog-15.12.3.ebuild
+++ b/kde-apps/kdebugdialog/kdebugdialog-15.12.3.ebuild
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Dialog box for setting preferences for debug output"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kdebugsettings/kdebugsettings-15.12.3.ebuild b/kde-apps/kdebugsettings/kdebugsettings-15.12.3.ebuild
index e704ddc45809..5e0c2dbf2b47 100644
--- a/kde-apps/kdebugsettings/kdebugsettings-15.12.3.ebuild
+++ b/kde-apps/kdebugsettings/kdebugsettings-15.12.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-15.12.3.ebuild b/kde-apps/kdecore-meta/kdecore-meta-15.12.3.ebuild
index 108ac1756171..bd91837a32d9 100644
--- a/kde-apps/kdecore-meta/kdecore-meta-15.12.3.ebuild
+++ b/kde-apps/kdecore-meta/kdecore-meta-15.12.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 +wallpapers"
 
 RDEPEND="
diff --git a/kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.ebuild b/kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.ebuild
index aafe67816d29..d4ee5699b570 100644
--- a/kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.ebuild
+++ b/kde-apps/kdeedu-data/kdeedu-data-15.12.3-r1.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-15.12.3-r1.ebuild b/kde-apps/kdeedu-meta/kdeedu-meta-15.12.3-r1.ebuild
index b431a48dde4b..b37368bb4e45 100644
--- a/kde-apps/kdeedu-meta/kdeedu-meta-15.12.3-r1.ebuild
+++ b/kde-apps/kdeedu-meta/kdeedu-meta-15.12.3-r1.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=""
 
 RDEPEND="
diff --git a/kde-apps/kdegames-meta/kdegames-meta-15.12.3.ebuild b/kde-apps/kdegames-meta/kdegames-meta-15.12.3.ebuild
index 8d5c2ca31735..d14dccb33b7e 100644
--- a/kde-apps/kdegames-meta/kdegames-meta-15.12.3.ebuild
+++ b/kde-apps/kdegames-meta/kdegames-meta-15.12.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-15.12.3.ebuild b/kde-apps/kdegraphics-meta/kdegraphics-meta-15.12.3.ebuild
index 9014cd755215..a3632789e69f 100644
--- a/kde-apps/kdegraphics-meta/kdegraphics-meta-15.12.3.ebuild
+++ b/kde-apps/kdegraphics-meta/kdegraphics-meta-15.12.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-15.12.3-r1.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.12.3-r1.ebuild
index 1936dcf72e4f..ff1014388565 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.12.3-r1.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.12.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.3.ebuild b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.3.ebuild
index 65606d27617a..ee3061de7f06 100644
--- a/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.3.ebuild
+++ b/kde-apps/kdemultimedia-meta/kdemultimedia-meta-15.12.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"
 
 # Add back whenever it is ported - no change since 4.10
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.3.ebuild
index f6b9f1b0eebb..188f20f1e0ea 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.12.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-15.12.3-r1.ebuild b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.12.3-r1.ebuild
index e752d36c01e6..ac2ebf02b6b5 100644
--- a/kde-apps/kdenetwork-meta/kdenetwork-meta-15.12.3-r1.ebuild
+++ b/kde-apps/kdenetwork-meta/kdenetwork-meta-15.12.3-r1.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"
 
 # FIXME: Add back when ready
diff --git a/kde-apps/kdenlive/kdenlive-15.12.3.ebuild b/kde-apps/kdenlive/kdenlive-15.12.3.ebuild
index 05200637d13e..8a3eb707a2e3 100644
--- a/kde-apps/kdenlive/kdenlive-15.12.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-15.12.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"
 
 RDEPEND="
diff --git a/kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild b/kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild
index caed22f34520..d600db54611b 100644
--- a/kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild
+++ b/kde-apps/kdepasswd/kdepasswd-15.12.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild
index 736be85e302c..57055dcdeaac 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	!kde-base/kdepim-l10n
 "
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.12.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.12.3.ebuild
index 20cd06bb0fc2..9b4f6c561c65 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.12.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.12.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug subversion"
 KMNAME="kdesdk-kioslaves"
 
diff --git a/kde-apps/kdesdk-meta/kdesdk-meta-15.12.3.ebuild b/kde-apps/kdesdk-meta/kdesdk-meta-15.12.3.ebuild
index a0310b596d68..0e47b9f5f032 100644
--- a/kde-apps/kdesdk-meta/kdesdk-meta-15.12.3.ebuild
+++ b/kde-apps/kdesdk-meta/kdesdk-meta-15.12.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-15.12.3.ebuild b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.3.ebuild
index f9393967f81d..fa656b388242 100644
--- a/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.3.ebuild
+++ b/kde-apps/kdesdk-thumbnailers/kdesdk-thumbnailers-15.12.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-15.12.3.ebuild b/kde-apps/kdesu/kdesu-15.12.3.ebuild
index f12f5941b9e6..e8e7fcf3ab0e 100644
--- a/kde-apps/kdesu/kdesu-15.12.3.ebuild
+++ b/kde-apps/kdesu/kdesu-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-apps/kdeutils-meta/kdeutils-meta-15.12.3.ebuild b/kde-apps/kdeutils-meta/kdeutils-meta-15.12.3.ebuild
index dd1dd600da5c..0a8ef22feb28 100644
--- a/kde-apps/kdeutils-meta/kdeutils-meta-15.12.3.ebuild
+++ b/kde-apps/kdeutils-meta/kdeutils-meta-15.12.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-15.12.3.ebuild b/kde-apps/kdewebdev-meta/kdewebdev-meta-15.12.3.ebuild
index 8dd658ef8076..4701f419f86e 100644
--- a/kde-apps/kdewebdev-meta/kdewebdev-meta-15.12.3.ebuild
+++ b/kde-apps/kdewebdev-meta/kdewebdev-meta-15.12.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-15.12.3.ebuild b/kde-apps/kdf/kdf-15.12.3.ebuild
index d409ca98342a..33b05b923b61 100644
--- a/kde-apps/kdf/kdf-15.12.3.ebuild
+++ b/kde-apps/kdf/kdf-15.12.3.ebuild
@@ -9,5 +9,5 @@ inherit kde4-base
 
 DESCRIPTION="KDE free disk space utility"
 HOMEPAGE="https://utils.kde.org/projects/kdf"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kdialog/kdialog-15.12.3.ebuild b/kde-apps/kdialog/kdialog-15.12.3.ebuild
index 0870e0ed25d4..b1c96b612d5c 100644
--- a/kde-apps/kdialog/kdialog-15.12.3.ebuild
+++ b/kde-apps/kdialog/kdialog-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kdiamond/kdiamond-15.12.3.ebuild b/kde-apps/kdiamond/kdiamond-15.12.3.ebuild
index a3356d191871..a9dae363575c 100644
--- a/kde-apps/kdiamond/kdiamond-15.12.3.ebuild
+++ b/kde-apps/kdiamond/kdiamond-15.12.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-15.12.3.ebuild b/kde-apps/kdontchangethehostname/kdontchangethehostname-15.12.3.ebuild
index 9fdf29efe7ab..bcd4d5f84d30 100644
--- a/kde-apps/kdontchangethehostname/kdontchangethehostname-15.12.3.ebuild
+++ b/kde-apps/kdontchangethehostname/kdontchangethehostname-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Tool to inform Plasma about a change in hostname"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild
index 5a46672f3102..c4cff7d9a327 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-15.12.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/keditfiletype/keditfiletype-15.12.3.ebuild b/kde-apps/keditfiletype/keditfiletype-15.12.3.ebuild
index f3277e9b30ea..6274ad8a55f7 100644
--- a/kde-apps/keditfiletype/keditfiletype-15.12.3.ebuild
+++ b/kde-apps/keditfiletype/keditfiletype-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # test fails, last checked for 4.2.89
diff --git a/kde-apps/kfile/kfile-15.12.3.ebuild b/kde-apps/kfile/kfile-15.12.3.ebuild
index 6d11b79261c7..4bede849f213 100644
--- a/kde-apps/kfile/kfile-15.12.3.ebuild
+++ b/kde-apps/kfile/kfile-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Commandline frontend to KFileMetaInfo"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kfilereplace/kfilereplace-15.12.3.ebuild b/kde-apps/kfilereplace/kfilereplace-15.12.3.ebuild
index 801d59286396..cf4907daea68 100644
--- a/kde-apps/kfilereplace/kfilereplace-15.12.3.ebuild
+++ b/kde-apps/kfilereplace/kfilereplace-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kfind/kfind-15.12.3.ebuild b/kde-apps/kfind/kfind-15.12.3.ebuild
index 8b8010959751..27e5055807f6 100644
--- a/kde-apps/kfind/kfind-15.12.3.ebuild
+++ b/kde-apps/kfind/kfind-15.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE file finder utility"
 HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-15.12.3.ebuild b/kde-apps/kfloppy/kfloppy-15.12.3.ebuild
index 2e983d21cc2c..4ce916f22592 100644
--- a/kde-apps/kfloppy/kfloppy-15.12.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-15.12.3.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="
 	https://www.kde.org/applications/utilities/kfloppy/
 	https://utils.kde.org/projects/kfloppy/
 "
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kfmclient/kfmclient-15.12.3.ebuild b/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
index 2179c7ee2b26..a2df445c0b89 100644
--- a/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
+++ b/kde-apps/kfmclient/kfmclient-15.12.3.ebuild
@@ -9,7 +9,7 @@ KMMODULE="konqueror/client"
 inherit kde4-meta
 
 DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 KMEXTRACTONLY="
diff --git a/kde-apps/kfourinline/kfourinline-15.12.3-r1.ebuild b/kde-apps/kfourinline/kfourinline-15.12.3-r1.ebuild
index 732b9ec48a24..40f69b451df1 100644
--- a/kde-apps/kfourinline/kfourinline-15.12.3-r1.ebuild
+++ b/kde-apps/kfourinline/kfourinline-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kgeography/kgeography-15.12.3.ebuild
index 525447702c81..a5d729e639b2 100644
--- a/kde-apps/kgeography/kgeography-15.12.3.ebuild
+++ b/kde-apps/kgeography/kgeography-15.12.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-15.12.3.ebuild b/kde-apps/kget/kget-15.12.3.ebuild
index ee80f9637f84..fce1819dd213 100644
--- a/kde-apps/kget/kget-15.12.3.ebuild
+++ b/kde-apps/kget/kget-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="An advanced download manager for KDE"
 HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug bittorrent gpg mms sqlite webkit"
 
 RDEPEND="
diff --git a/kde-apps/kglobalaccel/kglobalaccel-15.12.3.ebuild b/kde-apps/kglobalaccel/kglobalaccel-15.12.3.ebuild
index 8ed036e652b8..e6344e824a7b 100644
--- a/kde-apps/kglobalaccel/kglobalaccel-15.12.3.ebuild
+++ b/kde-apps/kglobalaccel/kglobalaccel-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 src_configure() {
diff --git a/kde-apps/kgoldrunner/kgoldrunner-15.12.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-15.12.3.ebuild
index 3738ccc9604f..28639cd60441 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-15.12.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kgoldrunner/
 	https://games.kde.org/game.php?game=kgoldrunner
 "
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kgpg/kgpg-15.12.3.ebuild b/kde-apps/kgpg/kgpg-15.12.3.ebuild
index 874b7b6cd8b1..9cee3f80dc93 100644
--- a/kde-apps/kgpg/kgpg-15.12.3.ebuild
+++ b/kde-apps/kgpg/kgpg-15.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde4-base
 DESCRIPTION="KDE gpg keyring manager"
 HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
 https://utils.kde.org/projects/kgpg"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/khangman/khangman-15.12.3.ebuild b/kde-apps/khangman/khangman-15.12.3.ebuild
index 38261c09f387..5e6dbbe0589a 100644
--- a/kde-apps/khangman/khangman-15.12.3.ebuild
+++ b/kde-apps/khangman/khangman-15.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Classical hangman game for 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/kiconfinder/kiconfinder-15.12.3.ebuild b/kde-apps/kiconfinder/kiconfinder-15.12.3.ebuild
index f7dec268ef7b..823857a0af20 100644
--- a/kde-apps/kiconfinder/kiconfinder-15.12.3.ebuild
+++ b/kde-apps/kiconfinder/kiconfinder-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Finds an icon based on its name"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kig/kig-15.12.3.ebuild b/kde-apps/kig/kig-15.12.3.ebuild
index 6cb248967115..6239dd14b343 100644
--- a/kde-apps/kig/kig-15.12.3.ebuild
+++ b/kde-apps/kig/kig-15.12.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-15.12.3.ebuild b/kde-apps/kigo/kigo-15.12.3.ebuild
index 895d195d77ce..29588febecba 100644
--- a/kde-apps/kigo/kigo-15.12.3.ebuild
+++ b/kde-apps/kigo/kigo-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Go game by KDE"
 HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/killbots/killbots-15.12.3.ebuild b/kde-apps/killbots/killbots-15.12.3.ebuild
index 7617e80e8a6b..1bbf6d20c87d 100644
--- a/kde-apps/killbots/killbots-15.12.3.ebuild
+++ b/kde-apps/killbots/killbots-15.12.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-15.12.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-15.12.3.ebuild
index 64bbe23f6776..788af1096092 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-15.12.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kimgio/kimgio-15.12.3.ebuild b/kde-apps/kimgio/kimgio-15.12.3.ebuild
index 77a3b36d777e..c45e976e02f2 100644
--- a/kde-apps/kimgio/kimgio-15.12.3.ebuild
+++ b/kde-apps/kimgio/kimgio-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE WebP image format plugin"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="media-libs/libwebp:="
diff --git a/kde-apps/kioclient/kioclient-15.12.3.ebuild b/kde-apps/kioclient/kioclient-15.12.3.ebuild
index c7f27813b9ea..f0ac9aa329e4 100644
--- a/kde-apps/kioclient/kioclient-15.12.3.ebuild
+++ b/kde-apps/kioclient/kioclient-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kiriki/kiriki-15.12.3.ebuild b/kde-apps/kiriki/kiriki-15.12.3.ebuild
index f1f779ce875b..1f40711b92e0 100644
--- a/kde-apps/kiriki/kiriki-15.12.3.ebuild
+++ b/kde-apps/kiriki/kiriki-15.12.3.ebuild
@@ -13,7 +13,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-15.12.3.ebuild b/kde-apps/kiten/kiten-15.12.3.ebuild
index 3a108c8af75a..948c691dc0b9 100644
--- a/kde-apps/kiten/kiten-15.12.3.ebuild
+++ b/kde-apps/kiten/kiten-15.12.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-15.12.3-r1.ebuild b/kde-apps/kjumpingcube/kjumpingcube-15.12.3-r1.ebuild
index e05b51b9a67c..766221a56fb5 100644
--- a/kde-apps/kjumpingcube/kjumpingcube-15.12.3-r1.ebuild
+++ b/kde-apps/kjumpingcube/kjumpingcube-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/klettres/klettres-15.12.3.ebuild
index 9d79ac8b92da..85ce89708b7f 100644
--- a/kde-apps/klettres/klettres-15.12.3.ebuild
+++ b/kde-apps/klettres/klettres-15.12.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-15.12.3.ebuild b/kde-apps/klickety/klickety-15.12.3.ebuild
index 720d78ca7e54..f7a8a5fe3648 100644
--- a/kde-apps/klickety/klickety-15.12.3.ebuild
+++ b/kde-apps/klickety/klickety-15.12.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-15.12.3.ebuild b/kde-apps/klines/klines-15.12.3.ebuild
index a80ddd09bb76..e941fe8bb423 100644
--- a/kde-apps/klines/klines-15.12.3.ebuild
+++ b/kde-apps/klines/klines-15.12.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-15.12.3.ebuild b/kde-apps/klinkstatus/klinkstatus-15.12.3.ebuild
index 11ac659acb86..3a3188078ecf 100644
--- a/kde-apps/klinkstatus/klinkstatus-15.12.3.ebuild
+++ b/kde-apps/klinkstatus/klinkstatus-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-apps/kmag/kmag-15.12.3.ebuild b/kde-apps/kmag/kmag-15.12.3.ebuild
index 15ef71da2aff..3e79c572f7b7 100644
--- a/kde-apps/kmag/kmag-15.12.3.ebuild
+++ b/kde-apps/kmag/kmag-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE screen magnifier"
 HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-15.12.3.ebuild b/kde-apps/kmahjongg/kmahjongg-15.12.3.ebuild
index 6bfbf1ba13a9..f5f47cd25dc5 100644
--- a/kde-apps/kmahjongg/kmahjongg-15.12.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-15.12.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="debug"
 
 DEPEND="
diff --git a/kde-apps/kmimetypefinder/kmimetypefinder-15.12.3.ebuild b/kde-apps/kmimetypefinder/kmimetypefinder-15.12.3.ebuild
index 5c5a6d5e0ac3..7af5c6dd2a72 100644
--- a/kde-apps/kmimetypefinder/kmimetypefinder-15.12.3.ebuild
+++ b/kde-apps/kmimetypefinder/kmimetypefinder-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kmines/kmines-15.12.3-r1.ebuild b/kde-apps/kmines/kmines-15.12.3-r1.ebuild
index 8c7195e8d914..a7520b50d7df 100644
--- a/kde-apps/kmines/kmines-15.12.3-r1.ebuild
+++ b/kde-apps/kmines/kmines-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kmix/kmix-15.12.3.ebuild
index 56c4202c6d4b..628f829dd9c3 100644
--- a/kde-apps/kmix/kmix-15.12.3.ebuild
+++ b/kde-apps/kmix/kmix-15.12.3.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-15.12.3.ebuild b/kde-apps/kmousetool/kmousetool-15.12.3.ebuild
index aa7a871c1c45..70c1d4ad9525 100644
--- a/kde-apps/kmousetool/kmousetool-15.12.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kmouth/kmouth-15.12.3.ebuild b/kde-apps/kmouth/kmouth-15.12.3.ebuild
index dd91166bae64..e7ed86f50904 100644
--- a/kde-apps/kmouth/kmouth-15.12.3.ebuild
+++ b/kde-apps/kmouth/kmouth-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kmplot/kmplot-15.12.3.ebuild b/kde-apps/kmplot/kmplot-15.12.3.ebuild
index 98beefabb859..aa0203e6b4dc 100644
--- a/kde-apps/kmplot/kmplot-15.12.3.ebuild
+++ b/kde-apps/kmplot/kmplot-15.12.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-15.12.3.ebuild b/kde-apps/knavalbattle/knavalbattle-15.12.3.ebuild
index f578ba21bd61..984121d1793d 100644
--- a/kde-apps/knavalbattle/knavalbattle-15.12.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-15.12.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-15.12.3.ebuild b/kde-apps/knetattach/knetattach-15.12.3.ebuild
index 97245f917c7e..70472dd49333 100644
--- a/kde-apps/knetattach/knetattach-15.12.3.ebuild
+++ b/kde-apps/knetattach/knetattach-15.12.3.ebuild
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/knetwalk/knetwalk-15.12.3-r1.ebuild b/kde-apps/knetwalk/knetwalk-15.12.3-r1.ebuild
index cd0bebe97854..14759d40c1d6 100644
--- a/kde-apps/knetwalk/knetwalk-15.12.3-r1.ebuild
+++ b/kde-apps/knetwalk/knetwalk-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/knewstuff/knewstuff-15.12.3.ebuild
index f4d5f36b13f9..573406f82f40 100644
--- a/kde-apps/knewstuff/knewstuff-15.12.3.ebuild
+++ b/kde-apps/knewstuff/knewstuff-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/knotify/knotify-15.12.3.ebuild b/kde-apps/knotify/knotify-15.12.3.ebuild
index 252c47252cbf..c30428e4db03 100644
--- a/kde-apps/knotify/knotify-15.12.3.ebuild
+++ b/kde-apps/knotify/knotify-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="The KDE notification daemon"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kolf/kolf-15.12.3.ebuild b/kde-apps/kolf/kolf-15.12.3.ebuild
index 1121ece186f1..2a67979fc53b 100644
--- a/kde-apps/kolf/kolf-15.12.3.ebuild
+++ b/kde-apps/kolf/kolf-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kolf/
 	https://games.kde.org/game.php?game=kolf
 "
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/kollision/kollision-15.12.3-r1.ebuild b/kde-apps/kollision/kollision-15.12.3-r1.ebuild
index 0805172b4c9d..802ff66ac79f 100644
--- a/kde-apps/kollision/kollision-15.12.3-r1.ebuild
+++ b/kde-apps/kollision/kollision-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kolourpaint/kolourpaint-15.12.3.ebuild
index 9a6a508b0264..53ec8a293945 100644
--- a/kde-apps/kolourpaint/kolourpaint-15.12.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="Paint Program for KDE"
 HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="BSD LGPL-2"
 IUSE="debug scanner"
 
diff --git a/kde-apps/kommander/kommander-15.12.3.ebuild b/kde-apps/kommander/kommander-15.12.3.ebuild
index 0dd1427b71bf..f681f7b91a35 100644
--- a/kde-apps/kommander/kommander-15.12.3.ebuild
+++ b/kde-apps/kommander/kommander-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kompare/kompare-15.12.3.ebuild b/kde-apps/kompare/kompare-15.12.3.ebuild
index 133049123720..e88dd30e9e0c 100644
--- a/kde-apps/kompare/kompare-15.12.3.ebuild
+++ b/kde-apps/kompare/kompare-15.12.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-15.12.3.ebuild b/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
index 503d13e11ed2..aca20dd56877 100644
--- a/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug tidy"
 
 DEPEND="
diff --git a/kde-apps/konqueror/konqueror-15.12.3.ebuild b/kde-apps/konqueror/konqueror-15.12.3.ebuild
index d177b02f3bd3..a11ebddafe06 100644
--- a/kde-apps/konqueror/konqueror-15.12.3.ebuild
+++ b/kde-apps/konqueror/konqueror-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/internet/konqueror/
 	https://konqueror.org/
 "
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bookmarks debug svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
diff --git a/kde-apps/konquest/konquest-15.12.3.ebuild b/kde-apps/konquest/konquest-15.12.3.ebuild
index 0a049a777304..3dd659a6431a 100644
--- a/kde-apps/konquest/konquest-15.12.3.ebuild
+++ b/kde-apps/konquest/konquest-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/konquest/
 	https://games.kde.org/game.php?game=konquest
 "
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/konsole/konsole-15.12.3.ebuild b/kde-apps/konsole/konsole-15.12.3.ebuild
index 4c94d03de51f..7cbf36da3086 100644
--- a/kde-apps/konsole/konsole-15.12.3.ebuild
+++ b/kde-apps/konsole/konsole-15.12.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-15.12.3.ebuild b/kde-apps/kopete/kopete-15.12.3.ebuild
index 828b5830c087..167a9fcdab88 100644
--- a/kde-apps/kopete/kopete-15.12.3.ebuild
+++ b/kde-apps/kopete/kopete-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
diff --git a/kde-apps/kpasswdserver/kpasswdserver-15.12.3.ebuild b/kde-apps/kpasswdserver/kpasswdserver-15.12.3.ebuild
index 1f94fb734ebc..b79937b1e20c 100644
--- a/kde-apps/kpasswdserver/kpasswdserver-15.12.3.ebuild
+++ b/kde-apps/kpasswdserver/kpasswdserver-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDED Password Module"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-apps/kpat/kpat-15.12.3-r1.ebuild b/kde-apps/kpat/kpat-15.12.3-r1.ebuild
index 45df93e0b87a..f60bcd75bae3 100644
--- a/kde-apps/kpat/kpat-15.12.3-r1.ebuild
+++ b/kde-apps/kpat/kpat-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kppp/kppp-15.12.3.ebuild
index 3d4cf1ac6737..636bd309a489 100644
--- a/kde-apps/kppp/kppp-15.12.3.ebuild
+++ b/kde-apps/kppp/kppp-15.12.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-15.12.3.ebuild b/kde-apps/kqtquickcharts/kqtquickcharts-15.12.3.ebuild
index ebb6102ad159..db0420eb9f3b 100644
--- a/kde-apps/kqtquickcharts/kqtquickcharts-15.12.3.ebuild
+++ b/kde-apps/kqtquickcharts/kqtquickcharts-15.12.3.ebuild
@@ -8,7 +8,7 @@ DECLARATIVE_REQUIRED="always"
 inherit kde4-base
 
 DESCRIPTION="Qt Quick 1 plugin for beautiful and interactive charts"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="$(add_kdeapps_dep plasma-runtime)"
diff --git a/kde-apps/kquitapp/kquitapp-15.12.3.ebuild b/kde-apps/kquitapp/kquitapp-15.12.3.ebuild
index 4dabc3e43aa4..b3cf486a7636 100644
--- a/kde-apps/kquitapp/kquitapp-15.12.3.ebuild
+++ b/kde-apps/kquitapp/kquitapp-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="A CLI application quitter"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/krdc/krdc-15.12.3.ebuild b/kde-apps/krdc/krdc-15.12.3.ebuild
index ad47ec48935c..28eb3452e28b 100644
--- a/kde-apps/krdc/krdc-15.12.3.ebuild
+++ b/kde-apps/krdc/krdc-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
 HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug jpeg +rdesktop telepathy vnc zeroconf"
 
 #nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1
diff --git a/kde-apps/kreadconfig/kreadconfig-15.12.3.ebuild b/kde-apps/kreadconfig/kreadconfig-15.12.3.ebuild
index ba5fd1954c06..126ddcc4630a 100644
--- a/kde-apps/kreadconfig/kreadconfig-15.12.3.ebuild
+++ b/kde-apps/kreadconfig/kreadconfig-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="Command-line tool to read KConfig entries"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kremotecontrol/kremotecontrol-15.12.3.ebuild b/kde-apps/kremotecontrol/kremotecontrol-15.12.3.ebuild
index cb28604122db..d014f3d620a4 100644
--- a/kde-apps/kremotecontrol/kremotecontrol-15.12.3.ebuild
+++ b/kde-apps/kremotecontrol/kremotecontrol-15.12.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-15.12.3.ebuild b/kde-apps/kreversi/kreversi-15.12.3.ebuild
index 8519b41319ba..e3ff282400b5 100644
--- a/kde-apps/kreversi/kreversi-15.12.3.ebuild
+++ b/kde-apps/kreversi/kreversi-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kreversi/
 	https://games.kde.org/game.php?game=kreversi
 "
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/krfb/krfb-15.12.3.ebuild b/kde-apps/krfb/krfb-15.12.3.ebuild
index 76bad2461302..256f7a7a0434 100644
--- a/kde-apps/krfb/krfb-15.12.3.ebuild
+++ b/kde-apps/krfb/krfb-15.12.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/kruler/kruler-15.12.3.ebuild b/kde-apps/kruler/kruler-15.12.3.ebuild
index c1c0705b344e..fb6e21d9633e 100644
--- a/kde-apps/kruler/kruler-15.12.3.ebuild
+++ b/kde-apps/kruler/kruler-15.12.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-15.12.3.ebuild b/kde-apps/ksaneplugin/ksaneplugin-15.12.3.ebuild
index b3d5acd514f2..9252ed07588c 100644
--- a/kde-apps/ksaneplugin/ksaneplugin-15.12.3.ebuild
+++ b/kde-apps/ksaneplugin/ksaneplugin-15.12.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="SANE Plugin for KDE"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kscd/kscd-15.12.3.ebuild b/kde-apps/kscd/kscd-15.12.3.ebuild
index 80ccdf5fba36..9ca0a25bb8d6 100644
--- a/kde-apps/kscd/kscd-15.12.3.ebuild
+++ b/kde-apps/kscd/kscd-15.12.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE CD player"
 HOMEPAGE="https://www.kde.org/applications/multimedia/kscd/"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kshisen/kshisen-15.12.3.ebuild b/kde-apps/kshisen/kshisen-15.12.3.ebuild
index 163f6fc49457..469c88300dd5 100644
--- a/kde-apps/kshisen/kshisen-15.12.3.ebuild
+++ b/kde-apps/kshisen/kshisen-15.12.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-15.12.3.ebuild b/kde-apps/ksirk/ksirk-15.12.3.ebuild
index 93d98141ecba..6954a8290795 100644
--- a/kde-apps/ksirk/ksirk-15.12.3.ebuild
+++ b/kde-apps/ksirk/ksirk-15.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksirk/
 	https://games.kde.org/game.php?game=ksirk
 "
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-15.12.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-15.12.3.ebuild
index 62d5078f26f0..5654f855d32d 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-15.12.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE Tron game"
 HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/kspaceduel/kspaceduel-15.12.3.ebuild b/kde-apps/kspaceduel/kspaceduel-15.12.3.ebuild
index 1ba6e4a57053..6fbf2067070e 100644
--- a/kde-apps/kspaceduel/kspaceduel-15.12.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/kspaceduel/
 	https://games.kde.org/game.php?game=kspaceduel
 "
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/ksquares/ksquares-15.12.3.ebuild b/kde-apps/ksquares/ksquares-15.12.3.ebuild
index f6dd9f4272d1..926ce71ad9d6 100644
--- a/kde-apps/ksquares/ksquares-15.12.3.ebuild
+++ b/kde-apps/ksquares/ksquares-15.12.3.ebuild
@@ -13,7 +13,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-15.12.3.ebuild b/kde-apps/kstars/kstars-15.12.3.ebuild
index 8ce8ec2b2c36..b4c93105ed3b 100644
--- a/kde-apps/kstars/kstars-15.12.3.ebuild
+++ b/kde-apps/kstars/kstars-15.12.3.ebuild
@@ -11,7 +11,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-15.12.3.ebuild b/kde-apps/kstart/kstart-15.12.3.ebuild
index 4e13202f4644..d9f236d776b0 100644
--- a/kde-apps/kstart/kstart-15.12.3.ebuild
+++ b/kde-apps/kstart/kstart-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/ksudoku/ksudoku-15.12.3.ebuild b/kde-apps/ksudoku/ksudoku-15.12.3.ebuild
index 9bcda29ccaed..6d26dd5b7cbd 100644
--- a/kde-apps/ksudoku/ksudoku-15.12.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/ksudoku/
 	https://games.kde.org/game.php?game=ksudoku
 "
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/ksystemlog/ksystemlog-15.12.3.ebuild b/kde-apps/ksystemlog/ksystemlog-15.12.3.ebuild
index abfef98242a7..14767480c5fb 100644
--- a/kde-apps/ksystemlog/ksystemlog-15.12.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-15.12.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-15.12.3.ebuild b/kde-apps/kteatime/kteatime-15.12.3.ebuild
index 86094b32c9d5..e9260f416271 100644
--- a/kde-apps/kteatime/kteatime-15.12.3.ebuild
+++ b/kde-apps/kteatime/kteatime-15.12.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-15.12.3.ebuild b/kde-apps/ktimer/ktimer-15.12.3.ebuild
index 51923ae121fe..c9fff5aaf4c4 100644
--- a/kde-apps/ktimer/ktimer-15.12.3.ebuild
+++ b/kde-apps/ktimer/ktimer-15.12.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-15.12.3.ebuild b/kde-apps/ktimezoned/ktimezoned-15.12.3.ebuild
index 7b8e7ba9a86a..28f8a133fd59 100644
--- a/kde-apps/ktimezoned/ktimezoned-15.12.3.ebuild
+++ b/kde-apps/ktimezoned/ktimezoned-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/ktouch/ktouch-15.12.3.ebuild b/kde-apps/ktouch/ktouch-15.12.3.ebuild
index 7fe097b0706a..b696c61bec95 100644
--- a/kde-apps/ktouch/ktouch-15.12.3.ebuild
+++ b/kde-apps/ktouch/ktouch-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
 HOMEPAGE="https://edu.kde.org/applications/miscellaneous/ktouch"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
index b3be076e1b73..48c9d6bb7aaa 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	!kde-apps/ktp-text-ui:4
 "
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
diff --git a/kde-apps/ktraderclient/ktraderclient-15.12.3.ebuild b/kde-apps/ktraderclient/ktraderclient-15.12.3.ebuild
index e7d65f3668a6..25c204e1e529 100644
--- a/kde-apps/ktraderclient/ktraderclient-15.12.3.ebuild
+++ b/kde-apps/ktraderclient/ktraderclient-15.12.3.ebuild
@@ -9,4 +9,4 @@ inherit kde4-meta
 
 DESCRIPTION="A command-line tool for querying the KDE trader system"
 IUSE="debug"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/kde-apps/ktuberling/ktuberling-15.12.3.ebuild b/kde-apps/ktuberling/ktuberling-15.12.3.ebuild
index 610b5c318e6f..668566193f1e 100644
--- a/kde-apps/ktuberling/ktuberling-15.12.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-15.12.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-15.12.3.ebuild b/kde-apps/kturtle/kturtle-15.12.3.ebuild
index 17034bdda259..739f34aa6ceb 100644
--- a/kde-apps/kturtle/kturtle-15.12.3.ebuild
+++ b/kde-apps/kturtle/kturtle-15.12.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-15.12.3.ebuild b/kde-apps/kubrick/kubrick-15.12.3.ebuild
index 03704e48c643..91a0fc720acc 100644
--- a/kde-apps/kubrick/kubrick-15.12.3.ebuild
+++ b/kde-apps/kubrick/kubrick-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="$(add_kdeapps_dep libkdegames)
diff --git a/kde-apps/kuiserver/kuiserver-15.12.3.ebuild b/kde-apps/kuiserver/kuiserver-15.12.3.ebuild
index b72781fd1f1e..02c1d8bfb857 100644
--- a/kde-apps/kuiserver/kuiserver-15.12.3.ebuild
+++ b/kde-apps/kuiserver/kuiserver-15.12.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/kurifilter-plugins/kurifilter-plugins-15.12.3.ebuild b/kde-apps/kurifilter-plugins/kurifilter-plugins-15.12.3.ebuild
index 4b6bbf9d50f0..82e9c6e2a395 100644
--- a/kde-apps/kurifilter-plugins/kurifilter-plugins-15.12.3.ebuild
+++ b/kde-apps/kurifilter-plugins/kurifilter-plugins-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE: Plugins to manage filtering URIs"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RESTRICT=test
diff --git a/kde-apps/kuser/kuser-15.12.3.ebuild b/kde-apps/kuser/kuser-15.12.3.ebuild
index 79be62a44241..8ab960b6b2d9 100644
--- a/kde-apps/kuser/kuser-15.12.3.ebuild
+++ b/kde-apps/kuser/kuser-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kwalletd/kwalletd-15.12.3.ebuild b/kde-apps/kwalletd/kwalletd-15.12.3.ebuild
index 9d9461a31b4d..41cf283260af 100644
--- a/kde-apps/kwalletd/kwalletd-15.12.3.ebuild
+++ b/kde-apps/kwalletd/kwalletd-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
 inherit kde4-meta
 
 DESCRIPTION="KDE Password Server"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug gpg"
 
 DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.12.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.12.3.ebuild
index a77270e7f8ca..98703f49d588 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-15.12.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-15.12.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-15.12.3-r1.ebuild b/kde-apps/kwordquiz/kwordquiz-15.12.3-r1.ebuild
index 32f52fcb79b8..01c22144d270 100644
--- a/kde-apps/kwordquiz/kwordquiz-15.12.3-r1.ebuild
+++ b/kde-apps/kwordquiz/kwordquiz-15.12.3-r1.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-15.12.3.ebuild b/kde-apps/kwrite/kwrite-15.12.3.ebuild
index c12cb8017246..cf44bd00941a 100644
--- a/kde-apps/kwrite/kwrite-15.12.3.ebuild
+++ b/kde-apps/kwrite/kwrite-15.12.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-15.12.3.ebuild b/kde-apps/libkcddb/libkcddb-15.12.3.ebuild
index 7f50c2a56073..2fc50c7250dd 100644
--- a/kde-apps/libkcddb/libkcddb-15.12.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-15.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug musicbrainz"
 
 # tests require network access and compare static data with online data
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild
index fe4b53c24eda..c483aa4045f1 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-15.12.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug"
 
 DEPEND="
diff --git a/kde-apps/libkdcraw/libkdcraw-15.12.3.ebuild b/kde-apps/libkdcraw/libkdcraw-15.12.3.ebuild
index d6adf2b7aa90..54e0a57a8742 100644
--- a/kde-apps/libkdcraw/libkdcraw-15.12.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-15.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Digital camera raw image library wrapper"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild b/kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild
index 8e90cfba4973..958e6c1ff118 100644
--- a/kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild
+++ b/kde-apps/libkdeedu/libkdeedu-15.12.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE educational apps"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # 4 of 4 tests fail. Last checked for 4.6.1. Tests are fundamentally broken,
diff --git a/kde-apps/libkdegames/libkdegames-15.12.3.ebuild b/kde-apps/libkdegames/libkdegames-15.12.3.ebuild
index d9b1b8f7c06e..c3e6408d6443 100644
--- a/kde-apps/libkdegames/libkdegames-15.12.3.ebuild
+++ b/kde-apps/libkdegames/libkdegames-15.12.3.ebuild
@@ -10,7 +10,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.3.ebuild b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.3.ebuild
index 1e0b1d982799..ebd299e34d01 100644
--- a/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.3.ebuild
+++ b/kde-apps/libkeduvocdocument/libkeduvocdocument-15.12.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-15.12.3.ebuild b/kde-apps/libkexiv2/libkexiv2-15.12.3.ebuild
index 418704a1f054..0b6e5fbb35d3 100644
--- a/kde-apps/libkexiv2/libkexiv2-15.12.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-15.12.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/libkipi/libkipi-15.12.3.ebuild b/kde-apps/libkipi/libkipi-15.12.3.ebuild
index a5fd85022fb2..7c2071cd9b0a 100644
--- a/kde-apps/libkipi/libkipi-15.12.3.ebuild
+++ b/kde-apps/libkipi/libkipi-15.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="A library for image plugins accross KDE applications"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-15.12.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-15.12.3.ebuild
index 63b38121f68c..93606325f006 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-15.12.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-15.12.3.ebuild
@@ -9,7 +9,7 @@ KDE_PUNT_BOGUS_DEPS="true"
 inherit kde5
 
 DESCRIPTION="LibKMahjongg for KDE"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkomparediff2/libkomparediff2-15.12.3.ebuild b/kde-apps/libkomparediff2/libkomparediff2-15.12.3.ebuild
index 0deea223bdb6..1a0989cc9ce4 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-15.12.3.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-15.12.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-15.12.3.ebuild b/kde-apps/libkonq/libkonq-15.12.3.ebuild
index 35e28b17e181..4fdb5b6b8ab5 100644
--- a/kde-apps/libkonq/libkonq-15.12.3.ebuild
+++ b/kde-apps/libkonq/libkonq-15.12.3.ebuild
@@ -10,7 +10,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-meta
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 RESTRICT="test"
 
diff --git a/kde-apps/libksane/libksane-15.12.3.ebuild b/kde-apps/libksane/libksane-15.12.3.ebuild
index e06fb3c23b6e..e587ad9c4a37 100644
--- a/kde-apps/libksane/libksane-15.12.3.ebuild
+++ b/kde-apps/libksane/libksane-15.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="SANE Library interface for KDE"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 LICENSE="LGPL-2"
 
diff --git a/kde-apps/lokalize/lokalize-15.12.3.ebuild b/kde-apps/lokalize/lokalize-15.12.3.ebuild
index 6cddd18e8204..2764614ee57d 100644
--- a/kde-apps/lokalize/lokalize-15.12.3.ebuild
+++ b/kde-apps/lokalize/lokalize-15.12.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-15.12.3.ebuild b/kde-apps/lskat/lskat-15.12.3.ebuild
index 5d13b45c2473..00c95450fb3a 100644
--- a/kde-apps/lskat/lskat-15.12.3.ebuild
+++ b/kde-apps/lskat/lskat-15.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/games/lskat/
 	https://games.kde.org/game.php?game=lskat
 "
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/marble/marble-15.12.3.ebuild b/kde-apps/marble/marble-15.12.3.ebuild
index a1875b9dbd0f..a45cc146d1ac 100644
--- a/kde-apps/marble/marble-15.12.3.ebuild
+++ b/kde-apps/marble/marble-15.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="https://marble.kde.org/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aprs designer-plugin gps +kde phonon shapefile"
 
diff --git a/kde-apps/nsplugins/nsplugins-15.12.3.ebuild b/kde-apps/nsplugins/nsplugins-15.12.3.ebuild
index a986a3d4742a..42c5659da8a4 100644
--- a/kde-apps/nsplugins/nsplugins-15.12.3.ebuild
+++ b/kde-apps/nsplugins/nsplugins-15.12.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
 inherit kde4-meta pax-utils
 
 DESCRIPTION="Netscape plugins support for Konqueror"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/okteta/okteta-15.12.3.ebuild b/kde-apps/okteta/okteta-15.12.3.ebuild
index 25d34578d086..9181a488c933 100644
--- a/kde-apps/okteta/okteta-15.12.3.ebuild
+++ b/kde-apps/okteta/okteta-15.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE hexeditor"
 HOMEPAGE="https://www.kde.org/applications/utilities/okteta
 https://utils.kde.org/projects/okteta"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="crypt examples"
 
 DEPEND="
diff --git a/kde-apps/okular/okular-15.12.3.ebuild b/kde-apps/okular/okular-15.12.3.ebuild
index 93f5720588c8..5d11c71cea02 100644
--- a/kde-apps/okular/okular-15.12.3.ebuild
+++ b/kde-apps/okular/okular-15.12.3.ebuild
@@ -14,7 +14,7 @@ inherit kde4-base
 
 DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
 HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
 
 DEPEND="
diff --git a/kde-apps/palapeli/palapeli-15.12.3.ebuild b/kde-apps/palapeli/palapeli-15.12.3.ebuild
index 9d948092faf8..5198776497d8 100644
--- a/kde-apps/palapeli/palapeli-15.12.3.ebuild
+++ b/kde-apps/palapeli/palapeli-15.12.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
 
 DESCRIPTION="KDE jigsaw puzzle game"
 HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/parley/parley-15.12.3.ebuild b/kde-apps/parley/parley-15.12.3.ebuild
index 043e056cc017..9433b2f79fd2 100644
--- a/kde-apps/parley/parley-15.12.3.ebuild
+++ b/kde-apps/parley/parley-15.12.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-15.12.3.ebuild b/kde-apps/phonon-kde/phonon-kde-15.12.3.ebuild
index 0b69e38beb6d..d229c267b822 100644
--- a/kde-apps/phonon-kde/phonon-kde-15.12.3.ebuild
+++ b/kde-apps/phonon-kde/phonon-kde-15.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Phonon KDE Integration"
 HOMEPAGE="https://phonon.kde.org"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug pulseaudio"
 
 DEPEND="
diff --git a/kde-apps/picmi/picmi-15.12.3.ebuild b/kde-apps/picmi/picmi-15.12.3.ebuild
index a2d77a757e49..694d20a6036d 100644
--- a/kde-apps/picmi/picmi-15.12.3.ebuild
+++ b/kde-apps/picmi/picmi-15.12.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 
 DESCRIPTION="Nonogram logic game for 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-15.12.3.ebuild b/kde-apps/plasma-apps/plasma-apps-15.12.3.ebuild
index 63e0e369e5d7..8ce660859e3e 100644
--- a/kde-apps/plasma-apps/plasma-apps-15.12.3.ebuild
+++ b/kde-apps/plasma-apps/plasma-apps-15.12.3.ebuild
@@ -9,7 +9,7 @@ KMMODULE="plasma"
 inherit kde4-meta
 
 DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/plasma-runtime/plasma-runtime-15.12.3.ebuild b/kde-apps/plasma-runtime/plasma-runtime-15.12.3.ebuild
index 3ca4744e9188..5de1bca55af7 100644
--- a/kde-apps/plasma-runtime/plasma-runtime-15.12.3.ebuild
+++ b/kde-apps/plasma-runtime/plasma-runtime-15.12.3.ebuild
@@ -10,7 +10,7 @@ DECLARATIVE_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/poxml/poxml-15.12.3.ebuild b/kde-apps/poxml/poxml-15.12.3.ebuild
index bc14bfba554d..f7dd906d8a02 100644
--- a/kde-apps/poxml/poxml-15.12.3.ebuild
+++ b/kde-apps/poxml/poxml-15.12.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-15.12.3.ebuild b/kde-apps/print-manager/print-manager-15.12.3.ebuild
index 26aa97877334..7ba5978c441a 100644
--- a/kde-apps/print-manager/print-manager-15.12.3.ebuild
+++ b/kde-apps/print-manager/print-manager-15.12.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-15.12.3.ebuild b/kde-apps/renamedlg-plugins/renamedlg-plugins-15.12.3.ebuild
index 3715af5bb710..1fa9d3e4e22f 100644
--- a/kde-apps/renamedlg-plugins/renamedlg-plugins-15.12.3.ebuild
+++ b/kde-apps/renamedlg-plugins/renamedlg-plugins-15.12.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="renamedlgplugins"
 inherit kde4-meta
 
 DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS=" amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/rocs/rocs-15.12.3.ebuild b/kde-apps/rocs/rocs-15.12.3.ebuild
index c5ffe03cdccd..37fdea544fd4 100644
--- a/kde-apps/rocs/rocs-15.12.3.ebuild
+++ b/kde-apps/rocs/rocs-15.12.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/solid-runtime/solid-runtime-15.12.3.ebuild b/kde-apps/solid-runtime/solid-runtime-15.12.3.ebuild
index 89330a3de28b..6742bb382ef7 100644
--- a/kde-apps/solid-runtime/solid-runtime-15.12.3.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug bluetooth networkmanager"
 
 KMEXTRA="
diff --git a/kde-apps/spectacle/spectacle-15.12.3.ebuild b/kde-apps/spectacle/spectacle-15.12.3.ebuild
index 1b01eb8a22ef..0b826246e578 100644
--- a/kde-apps/spectacle/spectacle-15.12.3.ebuild
+++ b/kde-apps/spectacle/spectacle-15.12.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="forceoptional"
 inherit kde5
 
 DESCRIPTION="Screenshot capture utility"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="kipi"
 
 DEPEND="
diff --git a/kde-apps/step/step-15.12.3.ebuild b/kde-apps/step/step-15.12.3.ebuild
index 11974701db8a..52080ad4ad4b 100644
--- a/kde-apps/step/step-15.12.3.ebuild
+++ b/kde-apps/step/step-15.12.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-15.12.3.ebuild b/kde-apps/svgpart/svgpart-15.12.3.ebuild
index 7974df794798..b998d148c97d 100644
--- a/kde-apps/svgpart/svgpart-15.12.3.ebuild
+++ b/kde-apps/svgpart/svgpart-15.12.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/sweeper/sweeper-15.12.3.ebuild b/kde-apps/sweeper/sweeper-15.12.3.ebuild
index a299d192bd92..32f69060675b 100644
--- a/kde-apps/sweeper/sweeper-15.12.3.ebuild
+++ b/kde-apps/sweeper/sweeper-15.12.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 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
diff --git a/kde-apps/thumbnailers/thumbnailers-15.12.3.ebuild b/kde-apps/thumbnailers/thumbnailers-15.12.3.ebuild
index 1989850c515e..da62e1eb41a8 100644
--- a/kde-apps/thumbnailers/thumbnailers-15.12.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-15.12.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-15.12.3.ebuild b/kde-apps/umbrello/umbrello-15.12.3.ebuild
index c650de212e31..40dda5ad9fdb 100644
--- a/kde-apps/umbrello/umbrello-15.12.3.ebuild
+++ b/kde-apps/umbrello/umbrello-15.12.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=""
 
 RDEPEND="
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.12.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.12.3.ebuild
index f5acc6c8bc1f..fe5fd1d925c3 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.12.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.12.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
-- 
2.26.2