commit:     aa10084434ff05bbfe1685d93a4ee601abbaf8ad
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 14 19:09:05 2017 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun 14 19:10:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa100844

kde-apps: Remove x86-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 +-
 kde-apps/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 +-
 kde-apps/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                              | 4 ++--
 kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-16.04.3-r1.ebuild  | 2 +-
 .../kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160611.ebuild  | 2 +-
 .../kdepim-kresources/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                     | 4 ++--
 kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild                   | 4 ++--
 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 +-
 kde-apps/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 +-
 kde-apps/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                     | 4 ++--
 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, 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 ce34e816866..1cd2f4f037c 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 aa9c09082d2..b61cb2e7a8b 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 8b657d047cc..7d33e6a80c7 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 2a2a0cbe6c2..793d309b93d 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 5cc8d576f18..1897a4b65d5 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 d23300e8487..13436364dff 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 1bd9fa02ef8..a854f2cb207 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 19c7ae677d1..02c869d137e 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 b0e4ba021ff..ee5d83cad88 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 cc3ee2874ab..6e2d061f986 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 4bb6dfd9e6c..f38054fafbe 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 6725d58b8c6..a73eb1dcb3b 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 dd8f30d6766..aa6d14336b0 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 62a02b54a41..9ecc5e4ee02 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 63ca832cc4f..5c5708e74d9 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 00897c0b3cb..e7fe20aad1e 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 aece114900d..88d03681981 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 9f9bd9df701..a0db3f82192 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 6e30f97ad10..ab584da3992 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 bed94f726af..58df38c87f7 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 aadf13b0d4e..fb52e3a5e0a 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 fb0e3301698..81401061ce7 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 5c85d4bc638..38754a2edfc 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 47514d15462..6e3e132cd30 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 ffe2d134833..fb18f738997 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 2afe8391714..2a3f3156433 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 047de201018..eb6bc8bc9ce 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 df9da495df5..7f74db7bb02 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 cccf0db5d2f..e4fd120153b 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 2beeeb1bdd9..0e25a5c2dc9 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 cb200125c31..14f0be4567c 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 f5bc6a77e71..3dc3ae147ed 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 3d039a02751..5cea44f447e 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 aa5f15224d9..6f083426f98 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 0dded9dba0f..5a99324ac40 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 5255d9e7ecb..4b8af04ecd1 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 ddfd936bdc8..c8b9478297f 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 a7e73b70cdf..f0b65096231 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 b0b06cf29e6..3579950bd55 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 7336129e706..f66964b1177 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 8ad23366710..48325d07559 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 18b70a62022..0e22aeb9c82 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 00c3717ccfd..ba986a1e800 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 2c6e6a81000..79b7e4be716 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 09bfcab15ad..3fb90a00d3e 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 afa574aa016..59b5db9ad32 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 ed8f3490167..b858f26a9e3 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 76cd7718177..f307a776f55 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 f93085df038..761d95f3c89 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 ed9e02f14d4..d12f2e52b00 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 bc1a35253b2..b31540095a4 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 b0f86327801..e794d69ed6a 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 1db55263d05..e8503e955c8 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 562991ad5f9..b7c88fd9aae 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 6d3442755cb..5bc2615548a 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 b55e4c58e2b..2c59b7f31c5 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 253dcb0d805..805f9bb2803 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 fbd6ab037d4..dda9ec6db4d 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 a16ff88ff60..075625694c7 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 d72015cd1eb..6fa560e5bda 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 a78956086e3..9ee0fde490c 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 b88bab12fd7..32d698f8261 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 addd4a12ad5..573a8035113 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 0029caa8920..4b70f61389a 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 0e74e17731b..8c9bf7a1f2c 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 7cbca924db0..6d5e03b5525 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 36af6104b52..919898f6b36 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 f6705a1e4ca..bd4c6b4aa9f 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 3ed100ff515..ca29300fa2d 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 c9da9363e7e..ea178731161 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 fd777920323..79a9854c86d 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 641f4c76efd..5a700196fdb 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";
 

Reply via email to