Merge updates from master

124 files changed, 124 insertions, 124 deletions

diff --git a/app-arch/dpkg/dpkg-1.19.2.ebuild b/app-arch/dpkg/dpkg-1.19.2.ebuild
index c5a8a36ffabb..c56f2a56df1e 100644
--- a/app-arch/dpkg/dpkg-1.19.2.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 
 RDEPEND="
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index 6ca50a90b2ff..ff292bbd19cc 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-xemacs/ada/ada-1.16.ebuild b/app-xemacs/ada/ada-1.16.ebuild
index 1b28d6d7083a..54a444be5b60 100644
--- a/app-xemacs/ada/ada-1.16.ebuild
+++ b/app-xemacs/ada/ada-1.16.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/apel/apel-1.36.ebuild b/app-xemacs/apel/apel-1.36.ebuild
index 08cbf87900ca..b87af35cf836 100644
--- a/app-xemacs/apel/apel-1.36.ebuild
+++ b/app-xemacs/apel/apel-1.36.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/auctex/auctex-1.58.ebuild b/app-xemacs/auctex/auctex-1.58.ebuild
index 12cb2614841a..2cdd82a3e31a 100644
--- a/app-xemacs/auctex/auctex-1.58.ebuild
+++ b/app-xemacs/auctex/auctex-1.58.ebuild
@@ -14,6 +14,6 @@ app-xemacs/mail-lib
 app-xemacs/edit-utils
 app-xemacs/xemacs-ispell
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/build/build-1.18.ebuild b/app-xemacs/build/build-1.18.ebuild
index f3e83058bb22..4a2593e6adca 100644
--- a/app-xemacs/build/build-1.18.ebuild
+++ b/app-xemacs/build/build-1.18.ebuild
@@ -13,6 +13,6 @@ app-xemacs/dired
 app-xemacs/w3
 app-xemacs/prog-modes
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/c-support/c-support-1.24.ebuild b/app-xemacs/c-support/c-support-1.24.ebuild
index faecd23fdf11..2e00f0ad4443 100644
--- a/app-xemacs/c-support/c-support-1.24.ebuild
+++ b/app-xemacs/c-support/c-support-1.24.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/calc/calc-1.28.ebuild b/app-xemacs/calc/calc-1.28.ebuild
index 7b989affb7b8..f517fddbe33c 100644
--- a/app-xemacs/calc/calc-1.28.ebuild
+++ b/app-xemacs/calc/calc-1.28.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/calendar/calendar-1.42.ebuild b/app-xemacs/calendar/calendar-1.42.ebuild
index 7f9c87ebf34a..0e16e94ad2de 100644
--- a/app-xemacs/calendar/calendar-1.42.ebuild
+++ b/app-xemacs/calendar/calendar-1.42.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cc-mode/cc-mode-1.99.ebuild b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
index 234f4e3afe95..88408b2143b8 100644
--- a/app-xemacs/cc-mode/cc-mode-1.99.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cedet-common/cedet-common-1.03.ebuild b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
index e9a8385cf36f..804b5ee225af 100644
--- a/app-xemacs/cedet-common/cedet-common-1.03.ebuild
+++ b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/clearcase/clearcase-1.12.ebuild b/app-xemacs/clearcase/clearcase-1.12.ebuild
index 6a9a7177aeb9..2fc07f07aa29 100644
--- a/app-xemacs/clearcase/clearcase-1.12.ebuild
+++ b/app-xemacs/clearcase/clearcase-1.12.ebuild
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/cookie/cookie-1.17.ebuild b/app-xemacs/cookie/cookie-1.17.ebuild
index aab5720c1be6..c662ad5c3377 100644
--- a/app-xemacs/cookie/cookie-1.17.ebuild
+++ b/app-xemacs/cookie/cookie-1.17.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/crisp/crisp-1.17.ebuild b/app-xemacs/crisp/crisp-1.17.ebuild
index 27593fd42663..b1e4ddf3192a 100644
--- a/app-xemacs/crisp/crisp-1.17.ebuild
+++ b/app-xemacs/crisp/crisp-1.17.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Crisp/Brief emulation"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/debug/debug-1.20.ebuild b/app-xemacs/debug/debug-1.20.ebuild
index 299bd96e5d53..4f8a9e43fc08 100644
--- a/app-xemacs/debug/debug-1.20.ebuild
+++ b/app-xemacs/debug/debug-1.20.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/docbookide/docbookide-0.10.ebuild b/app-xemacs/docbookide/docbookide-0.10.ebuild
index 43cf05646ea8..5d3d7130a15c 100644
--- a/app-xemacs/docbookide/docbookide-0.10.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.10.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/easypg/easypg-1.05.ebuild b/app-xemacs/easypg/easypg-1.05.ebuild
index 947d05743851..9017c31c6e19 100644
--- a/app-xemacs/easypg/easypg-1.05.ebuild
+++ b/app-xemacs/easypg/easypg-1.05.ebuild
@@ -10,7 +10,7 @@ inherit xemacs-packages
 SLOT="0"
 DESCRIPTION="GnuPG interface for Emacs"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired
diff --git a/app-xemacs/ecrypto/ecrypto-0.23.ebuild b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
index cd4e940c6921..8d6bb1c04c14 100644
--- a/app-xemacs/ecrypto/ecrypto-0.23.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ede/ede-1.07.ebuild b/app-xemacs/ede/ede-1.07.ebuild
index f6606560f59d..9baf269bb31f 100644
--- a/app-xemacs/ede/ede-1.07.ebuild
+++ b/app-xemacs/ede/ede-1.07.ebuild
@@ -10,4 +10,4 @@ inherit xemacs-packages
 SLOT="0"
 DESCRIPTION="Emacs Development Environment"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
diff --git a/app-xemacs/edebug/edebug-1.24.ebuild b/app-xemacs/edebug/edebug-1.24.ebuild
index 2f8d2152913c..89caf4ea29ff 100644
--- a/app-xemacs/edebug/edebug-1.24.ebuild
+++ b/app-xemacs/edebug/edebug-1.24.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-devel
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edict/edict-1.19.ebuild b/app-xemacs/edict/edict-1.19.ebuild
index 63b04996dc6a..d07f79d77edd 100644
--- a/app-xemacs/edict/edict-1.19.ebuild
+++ b/app-xemacs/edict/edict-1.19.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ediff/ediff-1.84.ebuild b/app-xemacs/ediff/ediff-1.84.ebuild
index fa5a45b84be4..8ca5fa888728 100644
--- a/app-xemacs/ediff/ediff-1.84.ebuild
+++ b/app-xemacs/ediff/ediff-1.84.ebuild
@@ -18,6 +18,6 @@ app-xemacs/tramp
 app-xemacs/vc
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/edit-utils-2.58.ebuild b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
index 569702f9bf3c..e5d825e52751 100644
--- a/app-xemacs/edit-utils/edit-utils-2.58.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.58.ebuild
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/dired
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/edt/edt-1.16.ebuild b/app-xemacs/edt/edt-1.16.ebuild
index 555dd1352416..ac7b05d646d4 100644
--- a/app-xemacs/edt/edt-1.16.ebuild
+++ b/app-xemacs/edt/edt-1.16.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/efs/efs-1.37.ebuild b/app-xemacs/efs/efs-1.37.ebuild
index 7451fd04e952..1417a4db1fd7 100644
--- a/app-xemacs/efs/efs-1.37.ebuild
+++ b/app-xemacs/efs/efs-1.37.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eieio/eieio-1.10.ebuild b/app-xemacs/eieio/eieio-1.10.ebuild
index 910fcc7ef006..5a4e50f8506f 100644
--- a/app-xemacs/eieio/eieio-1.10.ebuild
+++ b/app-xemacs/eieio/eieio-1.10.ebuild
@@ -12,6 +12,6 @@ app-xemacs/edebug
 app-xemacs/cedet-common
 app-xemacs/speedbar
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/elib/elib-1.15.ebuild b/app-xemacs/elib/elib-1.15.ebuild
index be710b4ecf3f..a5f6bbbaa049 100644
--- a/app-xemacs/elib/elib-1.15.ebuild
+++ b/app-xemacs/elib/elib-1.15.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/emerge/emerge-1.13.ebuild b/app-xemacs/emerge/emerge-1.13.ebuild
index 992cc8f18e85..66e47e3f19e7 100644
--- a/app-xemacs/emerge/emerge-1.13.ebuild
+++ b/app-xemacs/emerge/emerge-1.13.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Another interface over GNU patch"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/erc/erc-0.26.ebuild b/app-xemacs/erc/erc-0.26.ebuild
index 735c5e04b453..ca5e640c1648 100644
--- a/app-xemacs/erc/erc-0.26.ebuild
+++ b/app-xemacs/erc/erc-0.26.ebuild
@@ -7,7 +7,7 @@ SLOT="0"
 DESCRIPTION="ERC - The Emacs IRC Client"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
 
diff --git a/app-xemacs/escreen/escreen-1.03.ebuild b/app-xemacs/escreen/escreen-1.03.ebuild
index 1f781c520257..f7962d771851 100644
--- a/app-xemacs/escreen/escreen-1.03.ebuild
+++ b/app-xemacs/escreen/escreen-1.03.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/eudc/eudc-1.43.ebuild b/app-xemacs/eudc/eudc-1.43.ebuild
index a0c340dcf844..360a84485e91 100644
--- a/app-xemacs/eudc/eudc-1.43.ebuild
+++ b/app-xemacs/eudc/eudc-1.43.ebuild
@@ -20,6 +20,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/footnote/footnote-1.18.ebuild b/app-xemacs/footnote/footnote-1.18.ebuild
index 34451c79198a..b822223d7df9 100644
--- a/app-xemacs/footnote/footnote-1.18.ebuild
+++ b/app-xemacs/footnote/footnote-1.18.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/forms/forms-1.17.ebuild b/app-xemacs/forms/forms-1.17.ebuild
index 7c885c6972ad..115ecb6e839e 100644
--- a/app-xemacs/forms/forms-1.17.ebuild
+++ b/app-xemacs/forms/forms-1.17.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Forms editing support (obsolete, use Widget instead)"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
index 178a54c60758..4327b2c52895 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/frame-icon/frame-icon-1.13.ebuild b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
index ffebcd0303c9..9ab88a66b553 100644
--- a/app-xemacs/frame-icon/frame-icon-1.13.ebuild
+++ b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/games/games-1.23.ebuild b/app-xemacs/games/games-1.23.ebuild
index 53b578e14dcd..8d61479dac68 100644
--- a/app-xemacs/games/games-1.23.ebuild
+++ b/app-xemacs/games/games-1.23.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/general-docs/general-docs-1.10.ebuild b/app-xemacs/general-docs/general-docs-1.10.ebuild
index e2843817abb8..0c6fa2db73d3 100644
--- a/app-xemacs/general-docs/general-docs-1.10.ebuild
+++ b/app-xemacs/general-docs/general-docs-1.10.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="General XEmacs documentation"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/gnats/gnats-1.19.ebuild b/app-xemacs/gnats/gnats-1.19.ebuild
index 89ae95c5ddda..76529a4ce98f 100644
--- a/app-xemacs/gnats/gnats-1.19.ebuild
+++ b/app-xemacs/gnats/gnats-1.19.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
index 7d2cec9155ca..c828ed271fe4 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
@@ -12,6 +12,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/edit-utils
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
index 1df098273dcf..c8ef4be4e7ff 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
@@ -11,6 +11,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/hyperbole-1.22.ebuild b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
index b6d528608d7b..27340628c7d8 100644
--- a/app-xemacs/hyperbole/hyperbole-1.22.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
@@ -21,6 +21,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/ibuffer-1.12.ebuild b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
index 877dfa8fbda8..42c0dd38e693 100644
--- a/app-xemacs/ibuffer/ibuffer-1.12.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/idlwave/idlwave-1.34.ebuild b/app-xemacs/idlwave/idlwave-1.34.ebuild
index 4234acf9dd22..e803d6248c76 100644
--- a/app-xemacs/idlwave/idlwave-1.34.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.34.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/igrep/igrep-1.18.ebuild b/app-xemacs/igrep/igrep-1.18.ebuild
index f40ee3895de1..f4c762114f04 100644
--- a/app-xemacs/igrep/igrep-1.18.ebuild
+++ b/app-xemacs/igrep/igrep-1.18.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 app-xemacs/efs
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ilisp/ilisp-1.38.ebuild b/app-xemacs/ilisp/ilisp-1.38.ebuild
index 14a3bf9726f2..489d9615546b 100644
--- a/app-xemacs/ilisp/ilisp-1.38.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.38.ebuild
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
index 2ae1e16b95e4..b2bf53db753f 100644
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/latin-unity/latin-unity-1.23.ebuild b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
index 503449f08e0b..9ff74639c4fc 100644
--- a/app-xemacs/latin-unity/latin-unity-1.23.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
@@ -14,6 +14,6 @@ app-xemacs/leim
 app-xemacs/fsf-compat
 app-xemacs/dired
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/leim/leim-1.39.ebuild b/app-xemacs/leim/leim-1.39.ebuild
index 9c4fff79db11..a2ed0c9bee08 100644
--- a/app-xemacs/leim/leim-1.39.ebuild
+++ b/app-xemacs/leim/leim-1.39.ebuild
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/latin-euro-standards
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/locale/locale-1.30.ebuild b/app-xemacs/locale/locale-1.30.ebuild
index 2f0f72255327..d65bce47a5d3 100644
--- a/app-xemacs/locale/locale-1.30.ebuild
+++ b/app-xemacs/locale/locale-1.30.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/lookup/lookup-1.17.ebuild b/app-xemacs/lookup/lookup-1.17.ebuild
index 7ab990c5bb68..57371a1a36b3 100644
--- a/app-xemacs/lookup/lookup-1.17.ebuild
+++ b/app-xemacs/lookup/lookup-1.17.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/cookie
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/mail-lib-1.84.ebuild b/app-xemacs/mail-lib/mail-lib-1.84.ebuild
index 60fa9677e00f..c9fa9b2f7012 100644
--- a/app-xemacs/mail-lib/mail-lib-1.84.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.84.ebuild
@@ -13,6 +13,6 @@ app-xemacs/fsf-compat
 app-xemacs/sh-script
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
index de9daa39cb73..f14e12ca0c04 100644
--- a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
+++ b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
@@ -16,6 +16,6 @@ app-xemacs/mh-e
 app-xemacs/rmail
 app-xemacs/vm
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mew/mew-1.22.ebuild b/app-xemacs/mew/mew-1.22.ebuild
index c444f9d00555..bdf7c74950ac 100644
--- a/app-xemacs/mew/mew-1.22.ebuild
+++ b/app-xemacs/mew/mew-1.22.ebuild
@@ -13,6 +13,6 @@ app-xemacs/mail-lib
 app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mh-e/mh-e-1.35.ebuild b/app-xemacs/mh-e/mh-e-1.35.ebuild
index a47544f2212b..1f32fd038812 100644
--- a/app-xemacs/mh-e/mh-e-1.35.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.35.ebuild
@@ -23,6 +23,6 @@ app-xemacs/ecrypto
 app-xemacs/cedet-common
 app-xemacs/speedbar
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mine/mine-1.18.ebuild b/app-xemacs/mine/mine-1.18.ebuild
index 4a01ab97d197..918546c6bf40 100644
--- a/app-xemacs/mine/mine-1.18.ebuild
+++ b/app-xemacs/mine/mine-1.18.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/misc-games/misc-games-1.25.ebuild b/app-xemacs/misc-games/misc-games-1.25.ebuild
index 176a608a5350..f076a03918b1 100644
--- a/app-xemacs/misc-games/misc-games-1.25.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.25.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
index d232cc5cf68e..1458b2c7b74b 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mule-base/mule-base-1.60.ebuild b/app-xemacs/mule-base/mule-base-1.60.ebuild
index 7978720b4d39..08a2d990cbe2 100644
--- a/app-xemacs/mule-base/mule-base-1.60.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.60.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
index 6817d1691aee..61c94d98e991 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="mule"
 RDEPEND="app-xemacs/mule-base
 app-xemacs/latin-euro-standards
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/net-utils/net-utils-1.61.ebuild b/app-xemacs/net-utils/net-utils-1.61.ebuild
index 78537ea694bc..36796e405716 100644
--- a/app-xemacs/net-utils/net-utils-1.61.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.61.ebuild
@@ -13,6 +13,6 @@ app-xemacs/bbdb
 app-xemacs/xemacs-base
 app-xemacs/efs
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ocaml/ocaml-0.10.ebuild b/app-xemacs/ocaml/ocaml-0.10.ebuild
index 89653fec70af..a536f3e5c6fc 100644
--- a/app-xemacs/ocaml/ocaml-0.10.ebuild
+++ b/app-xemacs/ocaml/ocaml-0.10.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/oo-browser/oo-browser-1.07.ebuild b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
index 70d664cab5a1..1005534efe4b 100644
--- a/app-xemacs/oo-browser/oo-browser-1.07.ebuild
+++ b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
@@ -12,6 +12,6 @@ app-xemacs/hyperbole
 app-xemacs/gnus
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/os-utils/os-utils-1.44.ebuild b/app-xemacs/os-utils/os-utils-1.44.ebuild
index 1c9943cf045c..41549799bab1 100644
--- a/app-xemacs/os-utils/os-utils-1.44.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.44.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pc/pc-1.30.ebuild b/app-xemacs/pc/pc-1.30.ebuild
index 4167675f7499..82c3939aa445 100644
--- a/app-xemacs/pc/pc-1.30.ebuild
+++ b/app-xemacs/pc/pc-1.30.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
index 7f94b2529416..b0726fdca4f5 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
@@ -20,6 +20,6 @@ app-xemacs/tramp
 app-xemacs/gnus
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pcomplete/pcomplete-1.08.ebuild b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
index 30f4c6c75ed2..64126be3c57f 100644
--- a/app-xemacs/pcomplete/pcomplete-1.08.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/sh-script
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/perl-modes/perl-modes-1.16.ebuild b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
index 5946c4bcf2fc..21e94feac488 100644
--- a/app-xemacs/perl-modes/perl-modes-1.16.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
@@ -13,6 +13,6 @@ app-xemacs/ps-print
 app-xemacs/edit-utils
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/pgg/pgg-1.10.ebuild b/app-xemacs/pgg/pgg-1.10.ebuild
index b6a2cf210f95..7592b5aef111 100644
--- a/app-xemacs/pgg/pgg-1.10.ebuild
+++ b/app-xemacs/pgg/pgg-1.10.ebuild
@@ -12,6 +12,6 @@ app-xemacs/fsf-compat
 app-xemacs/edebug
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/prog-modes-2.33.ebuild b/app-xemacs/prog-modes/prog-modes-2.33.ebuild
index 72d26baf26bc..58bf5d803872 100644
--- a/app-xemacs/prog-modes/prog-modes-2.33.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.33.ebuild
@@ -25,6 +25,6 @@ app-xemacs/cedet-common
 app-xemacs/w3
 app-xemacs/gnus
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ps-print/ps-print-1.14.ebuild b/app-xemacs/ps-print/ps-print-1.14.ebuild
index 91b43ef7c120..915687289227 100644
--- a/app-xemacs/ps-print/ps-print-1.14.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.14.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
index 4231cb37602b..b3ef4663f8aa 100644
--- a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
@@ -15,6 +15,6 @@ app-xemacs/fsf-compat
 app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/psgml/psgml-1.50.ebuild b/app-xemacs/psgml/psgml-1.50.ebuild
index 1577d056a114..f3ca400a0ef2 100644
--- a/app-xemacs/psgml/psgml-1.50.ebuild
+++ b/app-xemacs/psgml/psgml-1.50.ebuild
@@ -17,6 +17,6 @@ app-xemacs/xemacs-eterm
 app-xemacs/sh-script
 app-xemacs/ps-print
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/python-modes/python-modes-1.16.ebuild b/app-xemacs/python-modes/python-modes-1.16.ebuild
index 17f1a08b8659..9b71d2d6ab60 100644
--- a/app-xemacs/python-modes/python-modes-1.16.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.16.ebuild
@@ -13,6 +13,6 @@ app-xemacs/edit-utils
 app-xemacs/fsf-compat
 app-xemacs/text-modes
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/re-builder/re-builder-1.07.ebuild b/app-xemacs/re-builder/re-builder-1.07.ebuild
index 33063ddf2c71..bfbea3846f41 100644
--- a/app-xemacs/re-builder/re-builder-1.07.ebuild
+++ b/app-xemacs/re-builder/re-builder-1.07.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="Interactive development tool for regular expressions"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/riece/riece-1.26.ebuild b/app-xemacs/riece/riece-1.26.ebuild
index 8c55f9a97dc4..5f7dc68129b1 100644
--- a/app-xemacs/riece/riece-1.26.ebuild
+++ b/app-xemacs/riece/riece-1.26.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib
 app-xemacs/bbdb
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
index 5b71cb005164..3dacfa8a9d09 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/debug
 "
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sasl/sasl-1.18.ebuild b/app-xemacs/sasl/sasl-1.18.ebuild
index 4bb0e0c35ac5..8d63f00efc7c 100644
--- a/app-xemacs/sasl/sasl-1.18.ebuild
+++ b/app-xemacs/sasl/sasl-1.18.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/scheme/scheme-1.22.ebuild b/app-xemacs/scheme/scheme-1.22.ebuild
index f7061c3ab6af..f750a15f2b56 100644
--- a/app-xemacs/scheme/scheme-1.22.ebuild
+++ b/app-xemacs/scheme/scheme-1.22.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sgml/sgml-1.13.ebuild b/app-xemacs/sgml/sgml-1.13.ebuild
index c4e1bf6360c6..15a38518b7b7 100644
--- a/app-xemacs/sgml/sgml-1.13.ebuild
+++ b/app-xemacs/sgml/sgml-1.13.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sh-script/sh-script-1.26.ebuild b/app-xemacs/sh-script/sh-script-1.26.ebuild
index 067d40b39b93..711af0729ffe 100644
--- a/app-xemacs/sh-script/sh-script-1.26.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.26.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sieve/sieve-1.20.ebuild b/app-xemacs/sieve/sieve-1.20.ebuild
index d6ba96851fe4..4f9ba55cdb42 100644
--- a/app-xemacs/sieve/sieve-1.20.ebuild
+++ b/app-xemacs/sieve/sieve-1.20.ebuild
@@ -14,6 +14,6 @@ app-xemacs/sasl
 app-xemacs/ecrypto
 app-xemacs/sh-script
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/skk/skk-1.27.ebuild b/app-xemacs/skk/skk-1.27.ebuild
index 0a14e1e41638..e62455d38651 100644
--- a/app-xemacs/skk/skk-1.27.ebuild
+++ b/app-xemacs/skk/skk-1.27.ebuild
@@ -13,6 +13,6 @@ app-xemacs/elib
 app-xemacs/xemacs-base
 app-xemacs/apel
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/slider/slider-1.18.ebuild b/app-xemacs/slider/slider-1.18.ebuild
index 0077ddd598c1..2b462680157d 100644
--- a/app-xemacs/slider/slider-1.18.ebuild
+++ b/app-xemacs/slider/slider-1.18.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="User interface tool"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sml-mode/sml-mode-0.14.ebuild b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
index bc898045bdd6..933afdfe0a7b 100644
--- a/app-xemacs/sml-mode/sml-mode-0.14.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sounds-au/sounds-au-1.14.ebuild b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
index eeff70080cf9..5aeb9fdaa750 100644
--- a/app-xemacs/sounds-au/sounds-au-1.14.ebuild
+++ b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="XEmacs Sun sound files"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
index ed7e69614999..b65d4dd51832 100644
--- a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
+++ b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="XEmacs Microsoft sound files"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/speedbar/speedbar-1.32.ebuild b/app-xemacs/speedbar/speedbar-1.32.ebuild
index 7ae3cac14a0f..e0d8c5ee2e78 100644
--- a/app-xemacs/speedbar/speedbar-1.32.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.32.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug
 app-xemacs/cedet-common
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/strokes/strokes-1.12.ebuild b/app-xemacs/strokes/strokes-1.12.ebuild
index 933d468a9ce5..617cb943f209 100644
--- a/app-xemacs/strokes/strokes-1.12.ebuild
+++ b/app-xemacs/strokes/strokes-1.12.ebuild
@@ -12,6 +12,6 @@ app-xemacs/edit-utils
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/sun/sun-1.19.ebuild b/app-xemacs/sun/sun-1.19.ebuild
index b60f159e94fe..fd6cd609ce64 100644
--- a/app-xemacs/sun/sun-1.19.ebuild
+++ b/app-xemacs/sun/sun-1.19.ebuild
@@ -13,6 +13,6 @@ SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/supercite/supercite-1.23.ebuild b/app-xemacs/supercite/supercite-1.23.ebuild
index b49aaac92818..0e0b17d40d55 100644
--- a/app-xemacs/supercite/supercite-1.23.ebuild
+++ b/app-xemacs/supercite/supercite-1.23.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/texinfo/texinfo-1.32.ebuild b/app-xemacs/texinfo/texinfo-1.32.ebuild
index 7e04feaddbd2..f6ba28edb0fa 100644
--- a/app-xemacs/texinfo/texinfo-1.32.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.32.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/text-modes/text-modes-2.06.ebuild b/app-xemacs/text-modes/text-modes-2.06.ebuild
index 6a1a6206f270..722785fd8917 100644
--- a/app-xemacs/text-modes/text-modes-2.06.ebuild
+++ b/app-xemacs/text-modes/text-modes-2.06.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/fsf-compat
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/textools/textools-1.17.ebuild b/app-xemacs/textools/textools-1.17.ebuild
index 0b8843e0f13e..3670cc152fff 100644
--- a/app-xemacs/textools/textools-1.17.ebuild
+++ b/app-xemacs/textools/textools-1.17.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/time/time-1.17.ebuild b/app-xemacs/time/time-1.17.ebuild
index 37159e69dd2d..e5ac1db00eb0 100644
--- a/app-xemacs/time/time-1.17.ebuild
+++ b/app-xemacs/time/time-1.17.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tm/tm-1.42.ebuild b/app-xemacs/tm/tm-1.42.ebuild
index c6cfff8a036c..ade50819ff1c 100644
--- a/app-xemacs/tm/tm-1.42.ebuild
+++ b/app-xemacs/tm/tm-1.42.ebuild
@@ -20,6 +20,6 @@ app-xemacs/sh-script
 app-xemacs/net-utils
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tooltalk/tooltalk-1.17.ebuild b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
index 4856e752bca8..7f5e25e5b9e5 100644
--- a/app-xemacs/tooltalk/tooltalk-1.17.ebuild
+++ b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Support for building with Tooltalk"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tpu/tpu-1.16.ebuild b/app-xemacs/tpu/tpu-1.16.ebuild
index a6f1a962a4b5..1e1ecd50270f 100644
--- a/app-xemacs/tpu/tpu-1.16.ebuild
+++ b/app-xemacs/tpu/tpu-1.16.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="DEC EDIT/TPU support"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/tramp/tramp-1.57.ebuild b/app-xemacs/tramp/tramp-1.57.ebuild
index e4f6bc666a3e..b0a5cddc3748 100644
--- a/app-xemacs/tramp/tramp-1.57.ebuild
+++ b/app-xemacs/tramp/tramp-1.57.ebuild
@@ -17,6 +17,6 @@ app-xemacs/ediff
 app-xemacs/sh-script
 app-xemacs/edebug
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vc-cc/vc-cc-1.24.ebuild b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
index 03260f3519e5..b7f53c70eeb0 100644
--- a/app-xemacs/vc-cc/vc-cc-1.24.ebuild
+++ b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
@@ -10,6 +10,6 @@ XEMACS_PKG_CAT="standard"
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vc/vc-1.50.ebuild b/app-xemacs/vc/vc-1.50.ebuild
index 621e0aae8243..710537f1661c 100644
--- a/app-xemacs/vc/vc-1.50.ebuild
+++ b/app-xemacs/vc/vc-1.50.ebuild
@@ -19,6 +19,6 @@ app-xemacs/elib
 app-xemacs/edebug
 app-xemacs/gnus
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vhdl/vhdl-1.24.ebuild b/app-xemacs/vhdl/vhdl-1.24.ebuild
index a13b87b93839..7546cdb5c389 100644
--- a/app-xemacs/vhdl/vhdl-1.24.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.24.ebuild
@@ -15,6 +15,6 @@ app-xemacs/ps-print
 app-xemacs/os-utils
 app-xemacs/cedet-common
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/view-process/view-process-1.15.ebuild b/app-xemacs/view-process/view-process-1.15.ebuild
index cfb39cc46ebf..3cbb113daa1a 100644
--- a/app-xemacs/view-process/view-process-1.15.ebuild
+++ b/app-xemacs/view-process/view-process-1.15.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/viper/viper-1.69.ebuild b/app-xemacs/viper/viper-1.69.ebuild
index 4866ee1fc5d4..e3e5ebef010e 100644
--- a/app-xemacs/viper/viper-1.69.ebuild
+++ b/app-xemacs/viper/viper-1.69.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/vm/vm-8.11.ebuild b/app-xemacs/vm/vm-8.11.ebuild
index b0dc3aa8bf83..ebd56f8d9a15 100644
--- a/app-xemacs/vm/vm-8.11.ebuild
+++ b/app-xemacs/vm/vm-8.11.ebuild
@@ -20,6 +20,6 @@ app-xemacs/os-utils
 app-xemacs/bbdb
 app-xemacs/fsf-compat
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/x-symbol/x-symbol-1.16.ebuild b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
index 7384deca8733..48677ac6830a 100644
--- a/app-xemacs/x-symbol/x-symbol-1.16.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-base
 app-xemacs/auctex
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
index 1168ec24b55d..ff6fa9f96dd1 100644
--- a/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-2.46.ebuild
@@ -7,6 +7,6 @@ SLOT="0"
 DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
 XEMACS_PKG_CAT="standard"
 
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-fbsd"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
index 490fdecd20de..121c13379301 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
@@ -19,6 +19,6 @@ app-xemacs/net-utils
 app-xemacs/xemacs-eterm
 app-xemacs/ecrypto
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
index d863a74ad32d..87d0deb16276 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Terminal emulation"
 
 SRC_URI="http://ftp.xemacs.org/pub/xemacs/packages/${MY_PN}-${PV}-pkg.tar.gz"
 
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 RDEPEND="app-xemacs/xemacs-base
 "
diff --git a/app-xemacs/xlib/xlib-1.16.ebuild b/app-xemacs/xlib/xlib-1.16.ebuild
index b159902a552e..fb58c79cfb11 100644
--- a/app-xemacs/xlib/xlib-1.16.ebuild
+++ b/app-xemacs/xlib/xlib-1.16.ebuild
@@ -9,6 +9,6 @@ XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xslide/xslide-1.11.ebuild b/app-xemacs/xslide/xslide-1.11.ebuild
index 40e601a2816e..f8763648b527 100644
--- a/app-xemacs/xslide/xslide-1.11.ebuild
+++ b/app-xemacs/xslide/xslide-1.11.ebuild
@@ -11,6 +11,6 @@ RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/mail-lib
 app-xemacs/xemacs-base
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/xwem/xwem-1.26.ebuild b/app-xemacs/xwem/xwem-1.26.ebuild
index 778e8e92d1d2..ecb924fde495 100644
--- a/app-xemacs/xwem/xwem-1.26.ebuild
+++ b/app-xemacs/xwem/xwem-1.26.ebuild
@@ -18,6 +18,6 @@ app-xemacs/elib
 app-xemacs/ilisp
 app-xemacs/mail-lib
 "
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/app-xemacs/zenirc/zenirc-1.18.ebuild b/app-xemacs/zenirc/zenirc-1.18.ebuild
index ebdde6e4081d..64d21e4b6c59 100644
--- a/app-xemacs/zenirc/zenirc-1.18.ebuild
+++ b/app-xemacs/zenirc/zenirc-1.18.ebuild
@@ -8,6 +8,6 @@ DESCRIPTION="ZENIRC IRC Client"
 XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
-KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 inherit xemacs-packages
diff --git a/dev-lang/mujs/mujs-1.0.4.ebuild b/dev-lang/mujs/mujs-1.0.4.ebuild
index f835e190f0c0..bf36fc690d91 100644
--- a/dev-lang/mujs/mujs-1.0.4.ebuild
+++ b/dev-lang/mujs/mujs-1.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 PATCHES=(
diff --git a/dev-python/pyalsa/pyalsa-1.1.6.ebuild b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
index 65b4d5242735..53005f0a245e 100644
--- a/dev-python/pyalsa/pyalsa-1.1.6.ebuild
+++ b/dev-python/pyalsa/pyalsa-1.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/pyalsa/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib"
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
index b02cc4e06a44..8f1d59d33668 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alisp debug doc elibc_uclibc python +thread-safety"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
index 7566a8cba60b..c45ce7de476b 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild
index 06876bf37446..ad228b2bdded 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.14.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
index d2442cb22f50..128573ffd423 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild
index 66afe43f5bd2..e2cfef9e9021 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0/2" # libpurple version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
index 6d968bcc876b..e0c568168d34 100644
--- a/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-4.17.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="icu libedit nls readline static-libs"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild
index c85ffaab89dc..005ff8e05aa9 100644
--- a/sys-libs/glibc/glibc-2.27-r6.ebuild
+++ b/sys-libs/glibc/glibc-2.27-r6.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 fi
 
diff --git a/sys-power/upower/upower-0.99.8-r1.ebuild b/sys-power/upower/upower-0.99.8-r1.ebuild
index be82b5b6047a..21fa3ae93623 100644
--- a/sys-power/upower/upower-0.99.8-r1.ebuild
+++ b/sys-power/upower/upower-0.99.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/upower/upower/uploads/${COMMIT}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0/3" # based on SONAME of libupower-glib.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 
 # gtk-doc files are not available as prebuilt in the tarball
 IUSE="doc +introspection ios kernel_FreeBSD kernel_linux selinux"
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
index a18f3cd17146..b447240db3bb 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-18.1.0.ebuild
@@ -9,7 +9,7 @@ inherit linux-info xorg-2
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd"
+	KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
 fi
 
 DESCRIPTION="ATI video driver"
diff --git a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
index 7f490f56e3d7..002af8fd1d3c 100644
--- a/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
+++ b/x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic xorg-2
 
 DESCRIPTION="ATI Rage128 video driver"
 
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="dri"
 
 RDEPEND=">=x11-base/xorg-server-1.2"