*/*: Drop all to ~ppc, ~ppc64

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

70 files changed, 70 insertions, 71 deletions

diff --git a/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild b/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
index 7ffd3cad..d7650845 100644
--- a/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
+++ b/app-crypt/qca-tls/qca-tls-1.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://delta.affinix.com/download/${PN%-*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 #alpha amd64 and ppc64 need testing
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="=app-crypt/qca-1*
diff --git a/app-crypt/qca/qca-1.0-r3.ebuild b/app-crypt/qca/qca-1.0-r3.ebuild
index ebabc92f..aa9a7e97 100644
--- a/app-crypt/qca/qca-1.0-r3.ebuild
+++ b/app-crypt/qca/qca-1.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://delta.affinix.com/download/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-qt/qt-meta:3"
diff --git a/app-doc/quanta-docs/quanta-docs-20051201.ebuild b/app-doc/quanta-docs/quanta-docs-20051201.ebuild
index ede89879..a1c72fb1 100644
--- a/app-doc/quanta-docs/quanta-docs-20051201.ebuild
+++ b/app-doc/quanta-docs/quanta-docs-20051201.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/quanta-css-${PV}.tar.bz2
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa mips ~ppc ~ppc64 ~sparc x86"
 IUSE="mysql"
 
 S=${WORKDIR}
diff --git a/app-editors/lfhex/lfhex-0.42.ebuild b/app-editors/lfhex/lfhex-0.42.ebuild
index 29c768e0..d6148dbe 100644
--- a/app-editors/lfhex/lfhex-0.42.ebuild
+++ b/app-editors/lfhex/lfhex-0.42.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-qt/qtgui:4
diff --git a/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild b/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
index 064e9408..0a3c63d1 100644
--- a/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
+++ b/app-eselect/eselect-qtgraphicssystem/eselect-qtgraphicssystem-1.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/gentoo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/hal-info/hal-info-20091130.ebuild b/app-misc/hal-info/hal-info-20091130.ebuild
index b1aad2b6..0954ec83 100644
--- a/app-misc/hal-info/hal-info-20091130.ebuild
+++ b/app-misc/hal-info/hal-info-20091130.ebuild
@@ -8,7 +8,7 @@ SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-apps/hal-0.5.10"
diff --git a/app-text/poppler/poppler-0.61.1.ebuild b/app-text/poppler/poppler-0.61.1.ebuild
index 06ac457e..f4ad45b8 100644
--- a/app-text/poppler/poppler-0.61.1.ebuild
+++ b/app-text/poppler/poppler-0.61.1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild b/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild
index 8d83afd2..4b082b46 100644
--- a/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild
+++ b/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.tuxcards.de/src/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-qt/qtgui:4"
diff --git a/dev-cpp/eigen/eigen-2.0.17.ebuild b/dev-cpp/eigen/eigen-2.0.17.ebuild
index ab64e861..636b55f7 100644
--- a/dev-cpp/eigen/eigen-2.0.17.ebuild
+++ b/dev-cpp/eigen/eigen-2.0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc examples test"
 # bugs 426236, 455460, 467288
 RESTRICT="test"
diff --git a/dev-db/hk_classes/hk_classes-0.8.3-r1.ebuild b/dev-db/hk_classes/hk_classes-0.8.3-r1.ebuild
index 4bfff9db..fae60dab 100644
--- a/dev-db/hk_classes/hk_classes-0.8.3-r1.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.8.3-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="doc firebird mdb mysql odbc postgres sqlite xbase"
 
 RDEPEND=">=media-libs/fontconfig-2.5.0-r1
diff --git a/dev-db/hk_classes/hk_classes-0.8.3.ebuild b/dev-db/hk_classes/hk_classes-0.8.3.ebuild
index 6db7f28b..9cd82284 100644
--- a/dev-db/hk_classes/hk_classes-0.8.3.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.8.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE="doc firebird mysql odbc postgres"
 
 RDEPEND=">=media-libs/fontconfig-2.5.0-r1
diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild
index 150f5a27..b5be6775 100644
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.8b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.gz"
 IUSE=""
 LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="~dev-qt/qt-meta-${PV}
 	dev-db/unixODBC"
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
index be046e4d..1c6187a7 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
@@ -7,7 +7,7 @@ WANT_AUTOMAKE="latest"
 
 inherit eutils multilib autotools
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86"
 
 DESCRIPTION="ODBC Interface for Linux."
 HOMEPAGE="http://www.unixodbc.org/"
diff --git a/dev-db/unixODBC/unixODBC-2.2.12.ebuild b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
index ef7f1dc3..e7e02901 100644
--- a/dev-db/unixODBC/unixODBC-2.2.12.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.12.ebuild
@@ -9,7 +9,7 @@ PATCH_P="${PN}-${PATCH_VERSION}-patches"
 
 inherit eutils multilib autotools gnuconfig libtool
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86"
 
 DESCRIPTION="ODBC Interface for Linux."
 HOMEPAGE="http://www.unixodbc.org/"
diff --git a/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild b/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild
index 43ca25ea..a43b4bf6 100644
--- a/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild
+++ b/dev-libs/dbus-qt3-old/dbus-qt3-old-0.70-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.kolumbus.fi/juuso.alasuutari/${P/-old}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.70"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="debug"
 
 RDEPEND=">=sys-apps/dbus-0.91"
diff --git a/dev-libs/grantlee/grantlee-0.4.0.ebuild b/dev-libs/grantlee/grantlee-0.4.0.ebuild
index f92edc2a..4d09b315 100644
--- a/dev-libs/grantlee/grantlee-0.4.0.ebuild
+++ b/dev-libs/grantlee/grantlee-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://downloads.grantlee.org/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/dev-libs/libattica/libattica-0.4.2.ebuild b/dev-libs/libattica/libattica-0.4.2.ebuild
index 56d8c04d..d6bd8d82 100644
--- a/dev-libs/libattica/libattica-0.4.2.ebuild
+++ b/dev-libs/libattica/libattica-0.4.2.ebuild
@@ -8,11 +8,10 @@ MY_PN="${PN#lib}"
 
 if [[ $PV = *9999* ]]; then
 	EGIT_REPO_URI="git://anongit.kde.org/attica"
-	KEYWORDS=""
 	scm_eclass=git-2
 else
 	SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit cmake-utils ${scm_eclass}
diff --git a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
index 96d91d19..b8d06d40 100644
--- a/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
+++ b/dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
 if [[ ${PV} != 9999* ]] ; then
 	MY_PV=${PV/_pre/+16.04.}
 	SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${MY_PV}.orig.tar.gz"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2"
diff --git a/dev-python/PyQt4/PyQt4-4.12.1.ebuild b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
index b1cbb2d1..f8701dc5 100644
--- a/dev-python/PyQt4/PyQt4-4.12.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.12.1.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="X compat dbus debug declarative designer doc examples help multimedia
 	opengl phonon script scripttools sql svg testlib webkit xmlpatterns"
diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild
index 9bf10dca..8c588cb5 100644
--- a/dev-qt/assistant/assistant-4.8.7.ebuild
+++ b/dev-qt/assistant/assistant-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="webkit"
diff --git a/dev-qt/designer/designer-4.8.7.ebuild b/dev-qt/designer/designer-4.8.7.ebuild
index 719daa4c..9d766529 100644
--- a/dev-qt/designer/designer-4.8.7.ebuild
+++ b/dev-qt/designer/designer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESIGNER_PLUGINS="declarative phonon qt3support webkit"
diff --git a/dev-qt/linguist/linguist-4.8.7.ebuild b/dev-qt/linguist/linguist-4.8.7.ebuild
index a00e505f..f30dbdc0 100644
--- a/dev-qt/linguist/linguist-4.8.7.ebuild
+++ b/dev-qt/linguist/linguist-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Graphical tool for translating Qt applications"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
index 63c5a735..100ba7c0 100644
--- a/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
+++ b/dev-qt/pixeltool/pixeltool-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Qt screen magnifier"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
index 8c3fb0b9..65584e42 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qt-meta/qt-meta-3.3.8b-r1.ebuild b/dev-qt/qt-meta/qt-meta-3.3.8b-r1.ebuild
index f505e3de..a4a88766 100644
--- a/dev-qt/qt-meta/qt-meta-3.3.8b-r1.ebuild
+++ b/dev-qt/qt-meta/qt-meta-3.3.8b-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://download.qt-project.org/archive/qt/3/qt-x11-${SRCTYPE}-${PV}.tar
 LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
 
 SLOT="3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="cups debug doc examples firebird ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
 
 RDEPEND="
diff --git a/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild b/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
index 324b9e89..701110f5 100644
--- a/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
+++ b/dev-qt/qt-meta/qt-meta-3.3.8b-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://download.qt-project.org/archive/qt/3/qt-x11-${SRCTYPE}-${PV}.tar
 LICENSE="|| ( QPL-1.0 GPL-2 GPL-3 )"
 
 SLOT="3"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="cups debug doc examples firebird ipv6 mysql nas nis odbc opengl postgres sqlite xinerama immqt immqt-bc"
 
 RDEPEND="
diff --git a/dev-qt/qt3support/qt3support-4.8.7.ebuild b/dev-qt/qt3support/qt3support-4.8.7.ebuild
index bb5cf53a..6f6c2c36 100644
--- a/dev-qt/qt3support/qt3support-4.8.7.ebuild
+++ b/dev-qt/qt3support/qt3support-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Qt3Support module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
index a9df5ca4..4f9ce50f 100644
--- a/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
+++ b/dev-qt/qtbearer/qtbearer-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The network bearer plugins for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="connman networkmanager"
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
index 53690e2c..daf75ef9 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r4.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="+glib iconv libressl qt3support ssl"
diff --git a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
index 90707421..36663d2f 100644
--- a/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
+++ b/dev-qt/qtdbus/qtdbus-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The DBus module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
index 41b3ca93..f8c5c437 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Declarative module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="+accessibility qt3support webkit"
diff --git a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
index 85b48b01..21ed0b6b 100644
--- a/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
+++ b/dev-qt/qtdemo/qtdemo-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Demonstration module and examples for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 fi
 
 IUSE="dbus declarative multimedia opengl phonon webkit xmlpatterns"
diff --git a/dev-qt/qtgui/qtgui-4.8.7.ebuild b/dev-qt/qtgui/qtgui-4.8.7.ebuild
index 9e146cb3..0bbbfe04 100644
--- a/dev-qt/qtgui/qtgui-4.8.7.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit eutils qt4-build-multilib
 DESCRIPTION="The GUI module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
diff --git a/dev-qt/qthelp/qthelp-4.8.7.ebuild b/dev-qt/qthelp/qthelp-4.8.7.ebuild
index bb6a5058..c4ccaab3 100644
--- a/dev-qt/qthelp/qthelp-4.8.7.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI+="
 	)"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="compat doc"
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
index 510e6875..85df465a 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The Multimedia module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 fi
 
 IUSE="alsa"
diff --git a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
index 3f0505f1..53430479 100644
--- a/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
+++ b/dev-qt/qtopengl/qtopengl-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The OpenGL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="egl qt3support"
diff --git a/dev-qt/qtscript/qtscript-4.8.7.ebuild b/dev-qt/qtscript/qtscript-4.8.7.ebuild
index 896d6e9f..bb5bb9f6 100644
--- a/dev-qt/qtscript/qtscript-4.8.7.ebuild
+++ b/dev-qt/qtscript/qtscript-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtScript module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="+jit"
diff --git a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
index 66736a3d..a2cdf5b1 100644
--- a/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
+++ b/dev-qt/qtsql/qtsql-4.8.7-r1.ebuild
@@ -7,7 +7,7 @@ inherit multilib qt4-build-multilib
 DESCRIPTION="The SQL module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="freetds mysql oci8 odbc postgres qt3support +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
index 13ea859a..7d6479c5 100644
--- a/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
+++ b/dev-qt/qtsvg/qtsvg-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The SVG module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE="+accessibility"
diff --git a/dev-qt/qttest/qttest-4.8.7.ebuild b/dev-qt/qttest/qttest-4.8.7.ebuild
index b2d4bc1a..8e3640f2 100644
--- a/dev-qt/qttest/qttest-4.8.7.ebuild
+++ b/dev-qt/qttest/qttest-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
index 9a2cb878..94e9ceeb 100644
--- a/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
+++ b/dev-qt/qttranslations/qttranslations-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Translation files for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
index 344324ee..4ab05dbc 100644
--- a/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-4.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${PN}-2.3/${MY_PV}/src/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="4"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
 IUSE="debug +gstreamer"
 
 RDEPEND="
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
index d102683c..92ead095 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.7.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="The XmlPatterns module for the Qt toolkit"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 fi
 
 IUSE=""
diff --git a/dev-util/automoc/automoc-0.9.88-r1.ebuild b/dev-util/automoc/automoc-0.9.88-r1.ebuild
index bc6a9503..c88d8b24 100644
--- a/dev-util/automoc/automoc-0.9.88-r1.ebuild
+++ b/dev-util/automoc/automoc-0.9.88-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/games-util/agistudio/agistudio-1.2.2.ebuild b/games-util/agistudio/agistudio-1.2.2.ebuild
index 55028824..b25620d2 100644
--- a/games-util/agistudio/agistudio-1.2.2.ebuild
+++ b/games-util/agistudio/agistudio-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="dev-qt/qt-meta:3"
diff --git a/kde-apps/kde4-l10n/kde4-l10n-4.11.2.ebuild b/kde-apps/kde4-l10n/kde4-l10n-4.11.2.ebuild
index 2b75fd8d..b0937916 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-4.11.2.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-4.11.2.ebuild
@@ -14,7 +14,7 @@ DEPEND="
 "
 RDEPEND="!<kde-apps/konq-plugins-4.6:4"
 
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+handbook"
 
 # /usr/portage/distfiles $ ls -1 kde-l10n-*-${PV}.* |sed -e 's:-${PV}.tar.xz::' -e 's:kde-l10n-::' |tr '\n' ' '
diff --git a/kde-base/kdebase-pam/kdebase-pam-7.ebuild b/kde-base/kdebase-pam/kdebase-pam-7.ebuild
index 8240071a..c9906992 100644
--- a/kde-base/kdebase-pam/kdebase-pam-7.ebuild
+++ b/kde-base/kdebase-pam/kdebase-pam-7.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org"
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="sys-libs/pam"
diff --git a/kde-misc/filelight-i18n/filelight-i18n-1.0.ebuild b/kde-misc/filelight-i18n/filelight-i18n-1.0.ebuild
index 8c63d6b9..b55d1395 100644
--- a/kde-misc/filelight-i18n/filelight-i18n-1.0.ebuild
+++ b/kde-misc/filelight-i18n/filelight-i18n-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.methylblue.com/filelight/packages/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND="~kde-misc/filelight-1.0"
diff --git a/media-libs/akode/akode-2.0.1-r1.ebuild b/media-libs/akode/akode-2.0.1-r1.ebuild
index d0a29af2..fe01b645 100644
--- a/media-libs/akode/akode-2.0.1-r1.ebuild
+++ b/media-libs/akode/akode-2.0.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://www.kde-apps.org/content/files/30375-${P}.tar.bz2
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa jack flac mp3 oss speex vorbis"
 
 DEPEND="media-libs/libsamplerate
diff --git a/media-libs/akode/akode-2.0.2.ebuild b/media-libs/akode/akode-2.0.2.ebuild
index d5957d45..f8315dd5 100644
--- a/media-libs/akode/akode-2.0.2.ebuild
+++ b/media-libs/akode/akode-2.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.kde-apps.org/CONTENT/content-files/30375-${P}.tar.bz2"
 LICENSE="LGPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="alsa jack flac mp3 oss speex vorbis"
 
 DEPEND="media-libs/libsamplerate
diff --git a/media-libs/dssi/dssi-0.9.1-r2.ebuild b/media-libs/dssi/dssi-0.9.1-r2.ebuild
index beaba6dd..23f53ca2 100644
--- a/media-libs/dssi/dssi-0.9.1-r2.ebuild
+++ b/media-libs/dssi/dssi-0.9.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND=">=media-libs/alsa-lib-1.0
 	>=media-libs/liblo-0.12
diff --git a/media-libs/dssi/dssi-0.9.1.ebuild b/media-libs/dssi/dssi-0.9.1.ebuild
index eb070cc3..4eb5ca41 100644
--- a/media-libs/dssi/dssi-0.9.1.ebuild
+++ b/media-libs/dssi/dssi-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/dssi/${P}.tar.gz"
 
 LICENSE="LGPL-2.1 BSD"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 RDEPEND=">=media-libs/alsa-lib-1.0
 	>=media-libs/liblo-0.12
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
index ceeabe2e..0a8a8134 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/lastfm/liblastfm"
 SRC_URI="https://github.com/lastfm/liblastfm/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="fingerprint test +qt4 qt5"
 
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
index 343e36c7..184d1b21 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r1.ebuild
@@ -8,7 +8,7 @@ MY_P=${MY_PN}-${PV}
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x64-macos"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
index af9ffd84..2a16bbfc 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.9.1-r1.ebuild
@@ -8,7 +8,7 @@ MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
diff --git a/media-libs/phonon/phonon-4.9.1-r1.ebuild b/media-libs/phonon/phonon-4.9.1-r1.ebuild
index 37a4157a..a7eb294f 100644
--- a/media-libs/phonon/phonon-4.9.1-r1.ebuild
+++ b/media-libs/phonon/phonon-4.9.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
diff --git a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
index 7079b060..9d6e678e 100644
--- a/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
+++ b/media-sound/hydrogen/hydrogen-0.9.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="alsa +archive jack ladspa lash oss portaudio"
 
 RDEPEND="dev-qt/qtgui:4 dev-qt/qtcore:4
diff --git a/net-dns/avahi/avahi-0.6.28-r1.ebuild b/net-dns/avahi/avahi-0.6.28-r1.ebuild
index ee913e77..f9120d68 100644
--- a/net-dns/avahi/avahi-0.6.28-r1.ebuild
+++ b/net-dns/avahi/avahi-0.6.28-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test "
 
 DBUS_DEPEND=">=sys-apps/dbus-0.30"
diff --git a/net-dns/avahi/avahi-0.6.31-r2.ebuild b/net-dns/avahi/avahi-0.6.31-r2.ebuild
index 2d947910..11d20fc1 100644
--- a/net-dns/avahi/avahi-0.6.31-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono python qt3 qt4 test utils"
 
 REQUIRED_USE="
diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild b/net-dns/avahi/avahi-0.6.31-r6.ebuild
index d25dbe32..e4b38704 100644
--- a/net-dns/avahi/avahi-0.6.31-r6.ebuild
+++ b/net-dns/avahi/avahi-0.6.31-r6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://avahi.org/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa m68k ~mips ppc ppc64 s390 ~sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt3 qt4 selinux test utils"
 
 REQUIRED_USE="
diff --git a/net-voip/twinkle/twinkle-1.4.2.ebuild b/net-voip/twinkle/twinkle-1.4.2.ebuild
index 65aec415..d657da0a 100644
--- a/net-voip/twinkle/twinkle-1.4.2.ebuild
+++ b/net-voip/twinkle/twinkle-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xs4all.nl/~mfnboer/twinkle/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="speex ilbc zrtp"
 
 RDEPEND=">=net-libs/ccrtp-1.6.0
diff --git a/sys-apps/hal/hal-0.5.14-r4.ebuild b/sys-apps/hal/hal-0.5.14-r4.ebuild
index dc4ef2da..43d4c762 100644
--- a/sys-apps/hal/hal-0.5.14-r4.ebuild
+++ b/sys-apps/hal/hal-0.5.14-r4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://kde-sunset/${MY_P}.tar.bz2
 
 LICENSE="|| ( GPL-2 AFL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 
 KERNEL_IUSE="kernel_linux kernel_FreeBSD"
 IUSE="X acpi apm crypt debug dell disk-partition doc laptop selinux ${KERNEL_IUSE}"
diff --git a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
index 0e71f1bd..e037e684 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.112.0_p20160416-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~kensington/distfiles/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="debug examples qt4"
 
 RDEPEND="
diff --git a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
index 63d3e072..0a3a9b27 100644
--- a/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-1.5.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz mirror://kde-sunset/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="=dev-qt/qt-meta-3*"
diff --git a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
index c031a221..e8425916 100644
--- a/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-1.7.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.riverbankcomputing.com/Downloads/QScintilla1/${MY_P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 DEPEND="dev-qt/qt-meta:3"
diff --git a/x11-libs/qscintilla/qscintilla-2.4.ebuild b/x11-libs/qscintilla/qscintilla-2.4.ebuild
index 1a95669a..bc3df479 100644
--- a/x11-libs/qscintilla/qscintilla-2.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="doc python +qt4"
 
 RDEPEND="qt4? ( dev-qt/qtgui:4 )
diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
index a11fd15a..f2f1e58f 100644
--- a/x11-libs/qwt/qwt-5.2.3-r2.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="qwt"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~x86-macos"
 SLOT="5"
 IUSE="doc examples static-libs svg"
 
diff --git a/x11-libs/qwt/qwt-6.1.3-r1.ebuild b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
index f25ee23c..bc5d1070 100644
--- a/x11-libs/qwt/qwt-6.1.3-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.3-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://qwt.sourceforge.net/"
 SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
 
 LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
-KEYWORDS="amd64 ~arm ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 SLOT="6/1.3"
 IUSE="designer doc examples mathml opengl qt4 qt5 static-libs svg"
 
diff --git a/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild b/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild
index e600bb22..9af748c4 100644
--- a/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild
+++ b/x11-themes/fusionx-aqua/fusionx-aqua-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.kdelook.org/content/files/5296-${MY_P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="=kde-base/kwin-3.5*
diff --git a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
index 7bff3227..fad056ff 100644
--- a/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.9.0-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="gtk nls plasma qt4 +qt5 test +X"
 
 if [[ ${KDE_BUILD_TYPE} = release ]] ; then
 	SRC_URI="https://github.com/KDE/qtcurve/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
 	S="${WORKDIR}/${P/_/-}"
 fi