kde-apps: Remove x86-linux keyword stray

Package-Manager: Portage-2.3.6, Repoman-2.3.2

72 files changed, 76 insertions, 76 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 ce34e816866a..1cd2f4f037c9 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 ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux"
 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 aa9c09082d26..b61cb2e7a8be 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160611.ebuild
index 8b657d047cc1..7d33e6a80c71 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/akregator/akregator-17.04.2.ebuild b/kde-apps/akregator/akregator-17.04.2.ebuild
index 2a2a0cbe6c25..793d309b93dd 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild b/kde-apps/akregator/akregator-4.14.11_pre20160611.ebuild
index 5cc8d576f187..1897a4b65d5e 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 d23300e8487a..13436364dffc 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/blogilo/blogilo-17.04.2.ebuild b/kde-apps/blogilo/blogilo-17.04.2.ebuild
index 1bd9fa02ef8e..a854f2cb2071 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 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 19c7ae677d1b..02c869d137e7 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 b0e4ba021ffc..ee5d83cad88c 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/calendarjanitor/calendarjanitor-17.04.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-17.04.2.ebuild
index cc3ee2874ab2..6e2d061f9869 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild b/kde-apps/calendarjanitor/calendarjanitor-4.14.11_pre20160611.ebuild
index 4bb6dfd9e6cc..f38054fafbe5 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 6725d58b8c61..a73eb1dcb3b9 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 dd8f30d67665..aa6d14336b0b 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kaddressbook/kaddressbook-17.04.2.ebuild b/kde-apps/kaddressbook/kaddressbook-17.04.2.ebuild
index 62a02b54a413..9ecc5e4ee02d 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 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 63ca832cc4f3..5c5708e74d9c 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 00897c0b3cbf..e7fe20aad1ee 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kalarm/kalarm-17.04.2.ebuild b/kde-apps/kalarm/kalarm-17.04.2.ebuild
index aece114900d3..88d03681981a 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 9f9bd9df7017..a0db3f821922 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 6e30f97ad101..ab584da39929 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 RDEPEND="
diff --git a/kde-apps/kapptemplate/kapptemplate-17.04.2.ebuild b/kde-apps/kapptemplate/kapptemplate-17.04.2.ebuild
index bed94f726afb..58df38c87f77 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 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/katepart/katepart-4.14.3.ebuild b/kde-apps/katepart/katepart-4.14.3.ebuild
index aadf13b0d4ea..fb52e3a5e0a5 100644
--- a/kde-apps/katepart/katepart-4.14.3.ebuild
+++ b/kde-apps/katepart/katepart-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
 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 fb0e33016981..81401061ce74 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 5c85d4bc6385..38754a2edfce 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 47514d154627..6e3e132cd30a 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 
 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 ffe2d134833f..fb18f738997c 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 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 2afe83917148..2a3f31564339 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ RDEPEND="
 	!<kde-apps/kde4-l10n-4.14.3-r1
 "
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 047de2010180..eb6bc8bc9ce3 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ RDEPEND="
 	!<kde-apps/kde4-l10n-4.14.3-r1
 "
 
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 df9da495df59..7f74db7bb02e 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 cccf0db5d2f6..e4fd120153b2 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 2beeeb1bdd96..0e25a5c2dc96 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 cb200125c310..14f0be4567c4 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 f5bc6a77e71b..3dc3ae147ed4 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 3d039a02751a..5cea44f447ea 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 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 aa5f15224d93..6f083426f984 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 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 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 0dded9dba0fb..5a99324ac40a 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 5255d9e7ecb1..4b8af04ecd10 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 ddfd936bdc8f..c8b9478297f6 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kleopatra/kleopatra-17.04.2.ebuild b/kde-apps/kleopatra/kleopatra-17.04.2.ebuild
index a7e73b70cdf4..f0b650962316 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild b/kde-apps/kleopatra/kleopatra-4.14.11_pre20160611.ebuild
index b0b06cf29e67..3579950bd551 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 7336129e7068..f66964b11771 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/kmail/kmail-17.04.2.ebuild b/kde-apps/kmail/kmail-17.04.2.ebuild
index 8ad233667102..48325d07559c 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 18b70a620221..0e22aeb9c828 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 00c3717ccfd8..ba986a1e800d 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 2c6e6a81000e..79b7e4be716e 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 09bfcab15ad1..3fb90a00d3e4 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 afa574aa0166..59b5db9ad320 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild b/kde-apps/knotes/knotes-4.14.11_pre20160611.ebuild
index ed8f34901673..b858f26a9e34 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 76cd77181777..f307a776f556 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 f93085df0389..761d95f3c896 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 
 IUSE=""
 
diff --git a/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.14.11_pre20160611.ebuild
index ed9e02f14d49..d12f2e52b003 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 bc1a35253b27..b31540095a4e 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
index b0f863278010..e794d69ed6a3 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 IUSE="debug"
 
 COMMONDEPEND="
diff --git a/kde-apps/kontact/kontact-17.04.2.ebuild b/kde-apps/kontact/kontact-17.04.2.ebuild
index 1db55263d05d..e8503e955c88 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 562991ad5f90..b7c88fd9aae0 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 6d3442755cb5..5bc2615548a0 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/korganizer/korganizer-17.04.2.ebuild b/kde-apps/korganizer/korganizer-17.04.2.ebuild
index b55e4c58e2ba..2c59b7f31c50 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 253dcb0d8058..805f9bb2803d 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 fbd6ab037d40..dda9ec6db4d3 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 a16ff88ff60f..075625694c79 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 d72015cd1eb8..6fa560e5bdab 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 a78956086e3e..9ee0fde490c1 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 b88bab12fd79..32d698f82616 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 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 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 addd4a12ad51..573a80351138 100644
--- a/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
+++ b/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit kde4-base
 
 DESCRIPTION="Base library common to many KDE games"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/libkdepim/libkdepim-17.04.2.ebuild b/kde-apps/libkdepim/libkdepim-17.04.2.ebuild
index 0029caa8920f..4b70f61389ab 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 0e74e17731bf..8c9bf7a1f2cd 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/libkleo/libkleo-17.04.2.ebuild b/kde-apps/libkleo/libkleo-17.04.2.ebuild
index 7cbca924db0e..6d5e03b55252 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 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 36af6104b526..919898f6b36a 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-17.04.2.ebuild b/kde-apps/libkmahjongg/libkmahjongg-17.04.2.ebuild
index f6705a1e4ca8..bd4c6b4aa9f1 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 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
diff --git a/kde-apps/libkmahjongg/libkmahjongg-4.14.3.ebuild b/kde-apps/libkmahjongg/libkmahjongg-4.14.3.ebuild
index 3ed100ff515e..ca29300fa2dd 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 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 c9da9363e7e9..ea1787311612 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 ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE="debug"
diff --git a/kde-apps/okteta/okteta-17.04.2.ebuild b/kde-apps/okteta/okteta-17.04.2.ebuild
index fd777920323e..79a9854c86d8 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 ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
 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 641f4c76efd0..5a700196fdb6 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 ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux"
 IUSE="debug doc examples test"
 HOMEPAGE="https://techbase.kde.org/Development/Languages/Python"