From 372bbd1ca2af9ada5fe0755fb0affb9865d430af Mon Sep 17 00:00:00 2001
From: Johannes Huber <johu@gentoo.org>
Date: Wed, 14 Jun 2017 21:09:46 +0200
Subject: [PATCH] kde-apps: Remove amd64-linux keyword stray

Package-Manager: Portage-2.3.6, Repoman-2.3.2
---
 kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild           | 2 +-
 kde-apps/akonadiconsole/akonadiconsole-17.04.2.ebuild           | 2 +-
 .../akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild    | 2 +-
 kde-apps/akregator/akregator-17.04.2.ebuild                     | 2 +-
 kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild         | 2 +-
 kde-apps/akregator/akregator-4.4.2017.04.ebuild                 | 2 +-
 kde-apps/blogilo/blogilo-17.04.2.ebuild                         | 2 +-
 kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild             | 2 +-
 kde-apps/blogilo/blogilo-4.4.2017.04.ebuild                     | 2 +-
 kde-apps/calendarjanitor/calendarjanitor-17.04.2.ebuild         | 2 +-
 .../calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild  | 2 +-
 kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild       | 2 +-
 kde-apps/kabcclient/kabcclient-4.4.2017.04.ebuild               | 2 +-
 kde-apps/kaddressbook/kaddressbook-17.04.2.ebuild               | 2 +-
 kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild   | 2 +-
 kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild           | 2 +-
 kde-apps/kalarm/kalarm-17.04.2.ebuild                           | 2 +-
 kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild               | 2 +-
 kde-apps/kalarm/kalarm-4.4.2017.04.ebuild                       | 2 +-
 kde-apps/kapptemplate/kapptemplate-17.04.2.ebuild               | 2 +-
 kde-apps/katepart/katepart-4.14.3.ebuild                        | 2 +-
 .../kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild | 2 +-
 .../kdepim-common-libs-4.14.11_pre20160611.ebuild               | 2 +-
 .../kdepim-kresources-4.14.11_pre20160611.ebuild                | 2 +-
 kde-apps/kdepim-kresources/kdepim-kresources-4.4.2017.04.ebuild | 2 +-
 kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild               | 2 +-
 kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild             | 2 +-
 kde-apps/kdepim-meta/kdepim-meta-17.04.2.ebuild                 | 2 +-
 kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild     | 2 +-
 kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild             | 2 +-
 kde-apps/kdepim-runtime/kdepim-runtime-17.04.2.ebuild           | 2 +-
 .../kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild | 2 +-
 kde-apps/kdepim-wizards/kdepim-wizards-4.4.2017.04.ebuild       | 2 +-
 kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild         | 2 +-
 kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild       | 2 +-
 kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild                 | 2 +-
 kde-apps/kjots/kjots-4.4.2017.04.ebuild                         | 2 +-
 kde-apps/kleopatra/kleopatra-17.04.2.ebuild                     | 2 +-
 kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild         | 2 +-
 kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild                 | 2 +-
 kde-apps/kmail/kmail-17.04.2.ebuild                             | 2 +-
 kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild                 | 2 +-
 kde-apps/kmail/kmail-4.4.2017.04.ebuild                         | 2 +-
 kde-apps/knode/knode-4.14.11_pre20160611.ebuild                 | 2 +-
 kde-apps/knode/knode-4.4.2017.04.ebuild                         | 2 +-
 kde-apps/knotes/knotes-17.04.2.ebuild                           | 2 +-
 kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild               | 2 +-
 kde-apps/knotes/knotes-4.4.2017.04.ebuild                       | 2 +-
 kde-apps/konsolekalendar/konsolekalendar-17.04.2.ebuild         | 2 +-
 .../konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild  | 2 +-
 kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild     | 2 +-
 kde-apps/konsolepart/konsolepart-4.14.3.ebuild                  | 2 +-
 kde-apps/kontact/kontact-17.04.2.ebuild                         | 2 +-
 kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild             | 2 +-
 kde-apps/kontact/kontact-4.4.2017.04.ebuild                     | 2 +-
 kde-apps/korganizer/korganizer-17.04.2.ebuild                   | 2 +-
 kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild       | 2 +-
 kde-apps/korganizer/korganizer-4.4.2017.04.ebuild               | 2 +-
 kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild   | 2 +-
 kde-apps/ktimetracker/ktimetracker-4.4.2017.04.ebuild           | 2 +-
 kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild                 | 2 +-
 kde-apps/libkdegames/libkdegames-17.04.2.ebuild                 | 2 +-
 kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild               | 2 +-
 kde-apps/libkdepim/libkdepim-17.04.2.ebuild                     | 2 +-
 kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild                 | 2 +-
 kde-apps/libkleo/libkleo-17.04.2.ebuild                         | 2 +-
 kde-apps/libkleo/libkleo-4.4.2017.04.ebuild                     | 2 +-
 kde-apps/libkmahjongg/libkmahjongg-17.04.2.ebuild               | 2 +-
 kde-apps/libkmahjongg/libkmahjongg-4.14.3.ebuild                | 2 +-
 kde-apps/libkpgp/libkpgp-4.4.2017.04.ebuild                     | 2 +-
 kde-apps/okteta/okteta-17.04.2.ebuild                           | 2 +-
 kde-apps/pykde4/pykde4-4.14.3-r3.ebuild                         | 2 +-
 72 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
index 1cd2f4f037c98..e8e587fbebcdf 100644
--- a/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://pim.kde.org/akonadi"
 
 LICENSE="LGPL-2.1"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="+mysql postgres sqlite test"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-17.04.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-17.04.2.ebuild
index b61cb2e7a8beb..8e7feb7fa08c1 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-17.04.2.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-17.04.2.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Application for debugging Akonadi Resources"
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
 HOMEPAGE="https://www.kde.org/"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
index 7d33e6a80c71b..35668a06d96ab 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
@@ -8,7 +8,7 @@ inherit kde4-meta
 
 DESCRIPTION="Akonadi developer console"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/akregator/akregator-17.04.2.ebuild b/kde-apps/akregator/akregator-17.04.2.ebuild
index 793d309b93dd6..778753d656751 100644
--- a/kde-apps/akregator/akregator-17.04.2.ebuild
+++ b/kde-apps/akregator/akregator-17.04.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="News feed aggregator"
 HOMEPAGE="https://www.kde.org/applications/internet/akregator"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild b/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
index 1897a4b65d5e1..2f892d640339b 100644
--- a/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
+++ b/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="News feed aggregator"
 HOMEPAGE="https://www.kde.org/applications/internet/akregator"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/akregator/akregator-4.4.2017.04.ebuild b/kde-apps/akregator/akregator-4.4.2017.04.ebuild
index 13436364dffcc..01ea76cc44613 100644
--- a/kde-apps/akregator/akregator-4.4.2017.04.ebuild
+++ b/kde-apps/akregator/akregator-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="News feed aggregator"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/blogilo/blogilo-17.04.2.ebuild b/kde-apps/blogilo/blogilo-17.04.2.ebuild
index a854f2cb20712..059bd28a4f38e 100644
--- a/kde-apps/blogilo/blogilo-17.04.2.ebuild
+++ b/kde-apps/blogilo/blogilo-17.04.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Application to create, edit and update blog content"
 HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
 LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="google"
 
diff --git a/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild b/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
index 02c869d137e72..f4d48ab86cd73 100644
--- a/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
+++ b/kde-apps/blogilo/blogilo-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Application to create, edit and update blog content"
 HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/blogilo/blogilo-4.4.2017.04.ebuild b/kde-apps/blogilo/blogilo-4.4.2017.04.ebuild
index ee5d83cad88cc..9a68cff608345 100644
--- a/kde-apps/blogilo/blogilo-4.4.2017.04.ebuild
+++ b/kde-apps/blogilo/blogilo-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Application to create, edit and update blog content"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.04.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.04.2.ebuild
index 6e2d061f98697..8363967d9d1b6 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-17.04.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-17.04.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
index f38054fafbe58..32e1b64bc333f 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="Tool to scan calendar data for buggy instances"
 HOMEPAGE="https://www.kde.org/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
index a73eb1dcb3b90..d4d29b5c877e8 100644
--- a/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kabcclient/kabcclient-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Command line client for accessing the KDE addressbook"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kabcclient/kabcclient-4.4.2017.04.ebuild b/kde-apps/kabcclient/kabcclient-4.4.2017.04.ebuild
index aa6d14336b0b3..2efb3f69eb9f9 100644
--- a/kde-apps/kabcclient/kabcclient-4.4.2017.04.ebuild
+++ b/kde-apps/kabcclient/kabcclient-4.4.2017.04.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="Command line client for accessing the KDE addressbook"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-17.04.2.ebuild b/kde-apps/kaddressbook/kaddressbook-17.04.2.ebuild
index 9ecc5e4ee02d3..f44d0ea313135 100644
--- a/kde-apps/kaddressbook/kaddressbook-17.04.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-17.04.2.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Address book application based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="prison"
 
diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
index 5c5708e74d9cf..5741f8d3428d3 100644
--- a/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Address book application"
 HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
index e7fe20aad1ee9..655160515a4f3 100644
--- a/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Address book application (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kalarm/kalarm-17.04.2.ebuild b/kde-apps/kalarm/kalarm-17.04.2.ebuild
index 88d03681981a5..1e3513aac2528 100644
--- a/kde-apps/kalarm/kalarm-17.04.2.ebuild
+++ b/kde-apps/kalarm/kalarm-17.04.2.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
 HOMEPAGE+=" https://userbase.kde.org/KAlarm"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 DEPEND="
diff --git a/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
index a0db3f8219225..7fe6efc31636c 100644
--- a/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kalarm/kalarm-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Personal alarm message, command and email scheduler by KDE"
 HOMEPAGE+=" https://userbase.kde.org/KAlarm"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kalarm/kalarm-4.4.2017.04.ebuild b/kde-apps/kalarm/kalarm-4.4.2017.04.ebuild
index ab584da39929e..70a97ef96608c 100644
--- a/kde-apps/kalarm/kalarm-4.4.2017.04.ebuild
+++ b/kde-apps/kalarm/kalarm-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Personal alarm message, command and email scheduler by KDE (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-17.04.2.ebuild b/kde-apps/kapptemplate/kapptemplate-17.04.2.ebuild
index 58df38c87f771..0e9f9c0b550b8 100644
--- a/kde-apps/kapptemplate/kapptemplate-17.04.2.ebuild
+++ b/kde-apps/kapptemplate/kapptemplate-17.04.2.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="A shell script to create the necessary framework to develop KDE applications"
 HOMEPAGE="https://www.kde.org/applications/development/kapptemplate"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katepart/katepart-4.14.3.ebuild b/kde-apps/katepart/katepart-4.14.3.ebuild
index fb52e3a5e0a5e..365d5b9a6bf0c 100644
--- a/kde-apps/katepart/katepart-4.14.3.ebuild
+++ b/kde-apps/katepart/katepart-4.14.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Editor KPart by KDE"
 HOMEPAGE+=" http://kate-editor.org/about-katepart/"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="debug"
 
 RESTRICT="test"
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
index 81401061ce749..eb8f2f4c48573 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit kde5-meta-pkg
 
 DESCRIPTION="Merge this to pull in all kdebase-runtime-derived packages"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="kwallet nls"
 
 [[ ${KDE_BUILD_TYPE} = live ]] && L10N_MINIMAL=${KDE_APPS_MINIMAL}
diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
index 38754a2edfce5..7322df6444220 100644
--- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="Common libraries for KDE PIM apps"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug google"
 
 DEPEND="
diff --git a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
index 6e3e132cd30a9..3df62b8faa9c5 100644
--- a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="KDE PIM groupware plugin collection"
 
 IUSE="debug"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 
 DEPEND="
 	$(add_kdeapps_dep kdepim-common-libs)
diff --git a/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2017.04.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2017.04.ebuild
index fb18f738997cc..88cbe01922e8c 100644
--- a/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2017.04.ebuild
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-4.4.2017.04.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE PIM groupware plugin collection (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
 IUSE="debug"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	$(add_kdeapps_dep kaddressbook)
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
index 2a3f31564339c..246b3205621d0 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	!<kde-apps/kde4-l10n-4.14.3-r1
 "
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl he
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
index eb6bc8bc9ce36..6d2a549f29c9b 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
@@ -17,7 +17,7 @@ RDEPEND="
 	!<kde-apps/kde4-l10n-4.14.3-r1
 "
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 MY_LANGS="ar bg ca ca@valencia cs csb da de el en_GB eo es et eu
diff --git a/kde-apps/kdepim-meta/kdepim-meta-17.04.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-17.04.2.ebuild
index 7f74db7bb02e1..b36597efb4333 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-17.04.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-17.04.2.ebuild
@@ -7,7 +7,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
 HOMEPAGE="https://www.kde.org/applications/development"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="google"
 
 RDEPEND="
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
index e4fd120153b21..682c060dbc0c0 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.11_pre20160611.ebuild
@@ -8,7 +8,7 @@ inherit kde5-meta-pkg
 
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
 HOMEPAGE+=" https://community.kde.org/KDE_PIM"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="nls"
 SLOT="4"
 
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild
index 0e25a5c2dc965..db85b85a3cbb3 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.4.2017.04.ebuild
@@ -9,7 +9,7 @@ inherit kde5-meta-pkg
 DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 SLOT="4"
 
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.2.ebuild
index 14f0be4567c49..8a73323fb59bf 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-17.04.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-17.04.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="google"
 
 # TODO kolab, Qt5TextToSpeech
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild
index 3dc3ae147ed4e..cb15b25a58c81 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211-r1.ebuild
@@ -13,7 +13,7 @@ COMMIT_ID="bb194cc299839cb00b808c9c5740169815ba9e39"
 SRC_URI="https://quickgit.kde.org/?p=kdepim-runtime.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${KMNAME}-${PV}.tar.gz"
 S=${WORKDIR}/${PN}
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug google"
 
 RESTRICT="test"
diff --git a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2017.04.ebuild b/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2017.04.ebuild
index 5cea44f447ea9..496d7c8aa6c69 100644
--- a/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2017.04.ebuild
+++ b/kde-apps/kdepim-wizards/kdepim-wizards-4.4.2017.04.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="KDE PIM wizards (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
 IUSE="debug"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	$(add_kdeapps_dep kdepim-kresources)
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
index 6f083426f9841..b30d8ec412422 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
 DESCRIPTION="Common library for KDE PIM apps"
 SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P/10_p/11_pre}.tar.xz"
 
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86"
 LICENSE="LGPL-2.1"
 IUSE="debug ldap prison"
 
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
index 5a99324ac40a6..a7b125eb666d4 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
@@ -8,7 +8,7 @@ CPPUNIT_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 LICENSE="LGPL-2.1"
 IUSE="debug ldap prison"
 
diff --git a/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild b/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
index 4b8af04ecd10d..f57e626dbd516 100644
--- a/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kjots/kjots-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Note taking utility by KDE"
 HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kjots/kjots-4.4.2017.04.ebuild b/kde-apps/kjots/kjots-4.4.2017.04.ebuild
index c8b9478297f6b..8ab1322a42bee 100644
--- a/kde-apps/kjots/kjots-4.4.2017.04.ebuild
+++ b/kde-apps/kjots/kjots-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Note taking utility by KDE (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kleopatra/kleopatra-17.04.2.ebuild b/kde-apps/kleopatra/kleopatra-17.04.2.ebuild
index f0b650962316d..a3d7373ecee25 100644
--- a/kde-apps/kleopatra/kleopatra-17.04.2.ebuild
+++ b/kde-apps/kleopatra/kleopatra-17.04.2.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
 HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
index 3579950bd5517..500ed3a29c625 100644
--- a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography"
 HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild b/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild
index f66964b117716..664c127151f31 100644
--- a/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild
+++ b/kde-apps/kleopatra/kleopatra-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Certificate manager and GUI for OpenPGP and CMS cryptography (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kmail/kmail-17.04.2.ebuild b/kde-apps/kmail/kmail-17.04.2.ebuild
index 48325d07559c9..03c15d1a06baa 100644
--- a/kde-apps/kmail/kmail-17.04.2.ebuild
+++ b/kde-apps/kmail/kmail-17.04.2.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
index 0e22aeb9c8286..2ba32a7eacd03 100644
--- a/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160611.ebuild
@@ -12,7 +12,7 @@ inherit flag-o-matic kde4-meta
 DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
 HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kmail/kmail-4.4.2017.04.ebuild b/kde-apps/kmail/kmail-4.4.2017.04.ebuild
index ba986a1e800d6..714bc01382f3d 100644
--- a/kde-apps/kmail/kmail-4.4.2017.04.ebuild
+++ b/kde-apps/kmail/kmail-4.4.2017.04.ebuild
@@ -11,7 +11,7 @@ inherit flag-o-matic kde4-meta
 DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/knode/knode-4.14.11_pre20160611.ebuild b/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
index 79b7e4be716ec..ee21b0993c6d7 100644
--- a/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
+++ b/kde-apps/knode/knode-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Usenet newsgroups and mailing lists reader by KDE"
 HOMEPAGE="https://www.kde.org/applications/internet/knode/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 # test fails, last checked for 4.2.96
diff --git a/kde-apps/knode/knode-4.4.2017.04.ebuild b/kde-apps/knode/knode-4.4.2017.04.ebuild
index 3fb90a00d3e46..7edeafc73c912 100644
--- a/kde-apps/knode/knode-4.4.2017.04.ebuild
+++ b/kde-apps/knode/knode-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Usenet newsgroups and mailing lists reader by KDE (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 # test fails, last checked for 4.2.96
diff --git a/kde-apps/knotes/knotes-17.04.2.ebuild b/kde-apps/knotes/knotes-17.04.2.ebuild
index 59b5db9ad3203..8c37161ae2c53 100644
--- a/kde-apps/knotes/knotes-17.04.2.ebuild
+++ b/kde-apps/knotes/knotes-17.04.2.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Note taking application"
 HOMEPAGE="https://www.kde.org/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
index b858f26a9e341..aa6505dd3305d 100644
--- a/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
+++ b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Note taking application"
 HOMEPAGE="https://www.kde.org/applications/utilities/knotes/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/knotes/knotes-4.4.2017.04.ebuild b/kde-apps/knotes/knotes-4.4.2017.04.ebuild
index f307a776f556e..b6b5ebfa74952 100644
--- a/kde-apps/knotes/knotes-4.4.2017.04.ebuild
+++ b/kde-apps/knotes/knotes-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Note taking application (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug +handbook"
 
 DEPEND="
diff --git a/kde-apps/konsolekalendar/konsolekalendar-17.04.2.ebuild b/kde-apps/konsolekalendar/konsolekalendar-17.04.2.ebuild
index 761d95f3c8967..f6884c92dc966 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-17.04.2.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-17.04.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
index d12f2e52b003e..9acaa285e98fc 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="Command line interface to KDE calendars"
 HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild
index b31540095a4eb..3d5ac6f5ba39e 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.4.2017.04.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
 DESCRIPTION="Command line interface to KDE calendars (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
index e794d69ed6a32..8124f6387072e 100644
--- a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
+++ b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
@@ -11,7 +11,7 @@ inherit kde4-base
 
 DESCRIPTION="X terminal kpart for use by konsole and other KDE applications"
 HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 COMMONDEPEND="
diff --git a/kde-apps/kontact/kontact-17.04.2.ebuild b/kde-apps/kontact/kontact-17.04.2.ebuild
index e8503e955c885..e6eb8f57fd9a8 100644
--- a/kde-apps/kontact/kontact-17.04.2.ebuild
+++ b/kde-apps/kontact/kontact-17.04.2.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Container application to unify several major PIM applications within one"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild b/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
index b7c88fd9aae08..e2b70147eefa4 100644
--- a/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
+++ b/kde-apps/kontact/kontact-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Container application to unify several major PIM applications within one"
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kontact/kontact-4.4.2017.04.ebuild b/kde-apps/kontact/kontact-4.4.2017.04.ebuild
index 5bc2615548a00..65bfe7bea77da 100644
--- a/kde-apps/kontact/kontact-4.4.2017.04.ebuild
+++ b/kde-apps/kontact/kontact-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Container application to unify PIM applications within one (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/korganizer/korganizer-17.04.2.ebuild b/kde-apps/korganizer/korganizer-17.04.2.ebuild
index 2c59b7f31c50f..47cea82838b95 100644
--- a/kde-apps/korganizer/korganizer-17.04.2.ebuild
+++ b/kde-apps/korganizer/korganizer-17.04.2.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
 HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 
 COMMON_DEPEND="
diff --git a/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
index 805f9bb2803d9..194d83fbc85f0 100644
--- a/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
+++ b/kde-apps/korganizer/korganizer-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Organizational assistant, providing calendars and other similar functionality"
 HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/korganizer/korganizer-4.4.2017.04.ebuild b/kde-apps/korganizer/korganizer-4.4.2017.04.ebuild
index dda9ec6db4d3e..62ec9b63b85e7 100644
--- a/kde-apps/korganizer/korganizer-4.4.2017.04.ebuild
+++ b/kde-apps/korganizer/korganizer-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Personal Organizer by KDE (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
index 075625694c793..eab28b31ae3df 100644
--- a/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
+++ b/kde-apps/ktimetracker/ktimetracker-4.14.11_pre20160611.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Tracks time spent on various tasks"
 HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/ktimetracker/ktimetracker-4.4.2017.04.ebuild b/kde-apps/ktimetracker/ktimetracker-4.4.2017.04.ebuild
index 6fa560e5bdaba..2e8bbb0d5c2b5 100644
--- a/kde-apps/ktimetracker/ktimetracker-4.4.2017.04.ebuild
+++ b/kde-apps/ktimetracker/ktimetracker-4.4.2017.04.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 DESCRIPTION="Tracks time spent on various tasks (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild b/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
index 9ee0fde490c19..7bfcb8d1405b4 100644
--- a/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
+++ b/kde-apps/ktnef/ktnef-4.14.11_pre20160611.ebuild
@@ -9,7 +9,7 @@ inherit kde4-meta
 
 DESCRIPTION="Viewer for TNEF attachments"
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 LICENSE="LGPL-2.1"
 IUSE="debug"
 
diff --git a/kde-apps/libkdegames/libkdegames-17.04.2.ebuild b/kde-apps/libkdegames/libkdegames-17.04.2.ebuild
index 32d698f826167..8b521470ef63f 100644
--- a/kde-apps/libkdegames/libkdegames-17.04.2.ebuild
+++ b/kde-apps/libkdegames/libkdegames-17.04.2.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild b/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
index 573a803511380..b81593f67aebb 100644
--- a/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
+++ b/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-17.04.2.ebuild b/kde-apps/libkdepim/libkdepim-17.04.2.ebuild
index 4b70f61389abc..b9d64e7cbd8a2 100644
--- a/kde-apps/libkdepim/libkdepim-17.04.2.ebuild
+++ b/kde-apps/libkdepim/libkdepim-17.04.2.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="Common PIM libraries"
 LICENSE="GPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild b/kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild
index 8c9bf7a1f2cd1..481cf1937ad52 100644
--- a/kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild
+++ b/kde-apps/libkdepim/libkdepim-4.4.2017.04.ebuild
@@ -8,7 +8,7 @@ inherit kde4-meta
 
 DESCRIPTION="Common library for KDE PIM apps (noakonadi branch)"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/libkleo/libkleo-17.04.2.ebuild b/kde-apps/libkleo/libkleo-17.04.2.ebuild
index 6d5e03b552528..1de7afaee0cd0 100644
--- a/kde-apps/libkleo/libkleo-17.04.2.ebuild
+++ b/kde-apps/libkleo/libkleo-17.04.2.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for encryption handling"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
index 919898f6b36a5..e9c3c2045ae61 100644
--- a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
+++ b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
@@ -8,7 +8,7 @@ inherit kde4-meta
 
 DESCRIPTION="Library for encryption handling"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-17.04.2.ebuild b/kde-apps/libkmahjongg/libkmahjongg-17.04.2.ebuild
index bd4c6b4aa9f10..1e917b5bea510 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-17.04.2.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-17.04.2.ebuild
@@ -7,7 +7,7 @@ KDE_BLOCK_SLOT4="false"
 inherit kde5
 
 DESCRIPTION="Mahjongg library based on Qt/KDE Frameworks"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-4.14.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-4.14.3.ebuild
index ca29300fa2dd3..d43e19f45459c 100644
--- a/kde-apps/libkmahjongg/libkmahjongg-4.14.3.ebuild
+++ b/kde-apps/libkmahjongg/libkmahjongg-4.14.3.ebuild
@@ -6,5 +6,5 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="LibKMahjongg by KDE"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug"
diff --git a/kde-apps/libkpgp/libkpgp-4.4.2017.04.ebuild b/kde-apps/libkpgp/libkpgp-4.4.2017.04.ebuild
index ea17873116124..7ffa08ae6d01a 100644
--- a/kde-apps/libkpgp/libkpgp-4.4.2017.04.ebuild
+++ b/kde-apps/libkpgp/libkpgp-4.4.2017.04.ebuild
@@ -10,5 +10,5 @@ inherit kde4-meta
 DESCRIPTION="KDE pgp abstraction library"
 HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
 
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
diff --git a/kde-apps/okteta/okteta-17.04.2.ebuild b/kde-apps/okteta/okteta-17.04.2.ebuild
index 79a9854c86d88..ecc44c1d1c8b7 100644
--- a/kde-apps/okteta/okteta-17.04.2.ebuild
+++ b/kde-apps/okteta/okteta-17.04.2.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 DESCRIPTION="KDE hexeditor"
 HOMEPAGE="https://www.kde.org/applications/utilities/okteta
 https://utils.kde.org/projects/okteta"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="crypt"
 
 DEPEND="
diff --git a/kde-apps/pykde4/pykde4-4.14.3-r3.ebuild b/kde-apps/pykde4/pykde4-4.14.3-r3.ebuild
index 5a700196fdb62..d6880dfacacfc 100644
--- a/kde-apps/pykde4/pykde4-4.14.3-r3.ebuild
+++ b/kde-apps/pykde4/pykde4-4.14.3-r3.ebuild
@@ -11,7 +11,7 @@ WEBKIT_REQUIRED="never"
 inherit python-r1 portability kde4-base multilib eutils
 
 DESCRIPTION="Python bindings for kdelibs-4"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm x86"
 IUSE="debug doc examples test"
 HOMEPAGE="https://techbase.kde.org/Development/Languages/Python"