Add exotic arches https://github.com/vaeth/mv-overlay/issues/6

57 files changed, 57 insertions, 57 deletions

diff --git a/app-admin/sudox/sudox-9.0.1.ebuild b/app-admin/sudox/sudox-9.0.1.ebuild
index cc75fb16..a5e4beef 100644
--- a/app-admin/sudox/sudox-9.0.1.ebuild
+++ b/app-admin/sudox/sudox-9.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="app-admin/sudo
 	>=app-shells/push-2.0-r2"
diff --git a/app-arch/archwrap/archwrap-11.2.ebuild b/app-arch/archwrap/archwrap-11.2.ebuild
index cbcff9d4..d429ec8a 100644
--- a/app-arch/archwrap/archwrap-11.2.ebuild
+++ b/app-arch/archwrap/archwrap-11.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=app-shells/push-3 !<app-arch/brotli-1.0.4"
 DEPEND=""
diff --git a/app-arch/bzwc/bzwc-5.0.ebuild b/app-arch/bzwc/bzwc-5.0.ebuild
index c4936cbf..c5e16845 100644
--- a/app-arch/bzwc/bzwc-5.0.ebuild
+++ b/app-arch/bzwc/bzwc-5.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=app-shells/push-2.0-r2"
 DEPEND=""
diff --git a/app-arch/paq8l/paq8l-20070308.ebuild b/app-arch/paq8l/paq8l-20070308.ebuild
index c76c1f20..14e11f1e 100644
--- a/app-arch/paq8l/paq8l-20070308.ebuild
+++ b/app-arch/paq8l/paq8l-20070308.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://mattmahoney.net/dc/${PN}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="app-arch/unzip"
diff --git a/app-portage/changelog-gitrepo/changelog-gitrepo-1.0.ebuild b/app-portage/changelog-gitrepo/changelog-gitrepo-1.0.ebuild
index 2ba484cd..a585e315 100644
--- a/app-portage/changelog-gitrepo/changelog-gitrepo-1.0.ebuild
+++ b/app-portage/changelog-gitrepo/changelog-gitrepo-1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-vcs/git"
diff --git a/app-portage/find_cruft/find_cruft-5.1.ebuild b/app-portage/find_cruft/find_cruft-5.1.ebuild
index 3f8f3005..fbed25c1 100644
--- a/app-portage/find_cruft/find_cruft-5.1.ebuild
+++ b/app-portage/find_cruft/find_cruft-5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8"
diff --git a/app-portage/logclean/logclean-18.2.ebuild b/app-portage/logclean/logclean-18.2.ebuild
index bf0d5a0f..52088fb3 100644
--- a/app-portage/logclean/logclean-18.2.ebuild
+++ b/app-portage/logclean/logclean-18.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # This should really depend on a USE-flag but must not by policy.
diff --git a/app-portage/portage-bashrc-mv/portage-bashrc-mv-15.0.ebuild b/app-portage/portage-bashrc-mv/portage-bashrc-mv-15.0.ebuild
index cc410a87..6b0e3e02 100644
--- a/app-portage/portage-bashrc-mv/portage-bashrc-mv-15.0.ebuild
+++ b/app-portage/portage-bashrc-mv/portage-bashrc-mv-15.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+ccache +cflags +localepurge +remove-la +title"
 
 # the ccache script would run without dev-util/ccache but would be pointless:
diff --git a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-7.1.ebuild b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-7.1.ebuild
index 66e58328..b98f5778 100644
--- a/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-7.1.ebuild
+++ b/app-portage/portage-postsyncd-mv/portage-postsyncd-mv-7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+portage-utils"
 
 # These should really depend on USE-flags but must not by policy.
diff --git a/app-portage/trickyfetch/trickyfetch-8.20.ebuild b/app-portage/trickyfetch/trickyfetch-8.20.ebuild
index d23fda40..fe729e8e 100644
--- a/app-portage/trickyfetch/trickyfetch-8.20.ebuild
+++ b/app-portage/trickyfetch/trickyfetch-8.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-portage/useflags/useflags-4.1.3.ebuild b/app-portage/useflags/useflags-4.1.3.ebuild
index b62670b6..bd40e139 100644
--- a/app-portage/useflags/useflags-4.1.3.ebuild
+++ b/app-portage/useflags/useflags-4.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # These should really depend on USE-flags but must not by policy.
diff --git a/app-portage/world-mv/world-mv-3.19.ebuild b/app-portage/world-mv/world-mv-3.19.ebuild
index a808161e..de264cdd 100644
--- a/app-portage/world-mv/world-mv-3.19.ebuild
+++ b/app-portage/world-mv/world-mv-3.19.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${mPN}-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 S="${WORKDIR}/${mPN}-${PV}"
 
diff --git a/app-shells/command-not-found/command-not-found-0.4.5.ebuild b/app-shells/command-not-found/command-not-found-0.4.5.ebuild
index d5aa80a5..88da618d 100644
--- a/app-shells/command-not-found/command-not-found-0.4.5.ebuild
+++ b/app-shells/command-not-found/command-not-found-0.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/metti/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 COMMON="sys-libs/tdb"
diff --git a/dev-cpp/cpplint/cpplint-99999999.ebuild b/dev-cpp/cpplint/cpplint-99999999.ebuild
index fd1ea185..ce07b28c 100644
--- a/dev-cpp/cpplint/cpplint-99999999.ebuild
+++ b/dev-cpp/cpplint/cpplint-99999999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/google/styleguide"
 SRC_URI=""
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 EMACSNAME="google-c-style"
diff --git a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
index 280cd3d4..3cdff453 100644
--- a/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
+++ b/dev-perl/File-lchown/File-lchown-0.20-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Use the lchown(2) and lutimes(2) system call from Perl"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-tex/chklref/chklref-2.6.0.ebuild b/dev-tex/chklref/chklref-2.6.0.ebuild
index 014f8474..5b16ff01 100644
--- a/dev-tex/chklref/chklref-2.6.0.ebuild
+++ b/dev-tex/chklref/chklref-2.6.0.ebuild
@@ -18,7 +18,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/latex-base
diff --git a/dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild b/dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild
index 014f8474..5b16ff01 100644
--- a/dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild
+++ b/dev-tex/chklref/chklref-2.6.1_alpha20170913.ebuild
@@ -18,7 +18,7 @@ esac
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/latex-base
diff --git a/dev-util/comp/comp-4.3.ebuild b/dev-util/comp/comp-4.3.ebuild
index b58ff280..61f6ab03 100644
--- a/dev-util/comp/comp-4.3.ebuild
+++ b/dev-util/comp/comp-4.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # This should really depend on a USE-flag but must not by policy.
diff --git a/dev-util/diffhelp/diffhelp-1.11.ebuild b/dev-util/diffhelp/diffhelp-1.11.ebuild
index e1f27c56..20f1fa61 100644
--- a/dev-util/diffhelp/diffhelp-1.11.ebuild
+++ b/dev-util/diffhelp/diffhelp-1.11.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/mv_perl/mv_perl-3.16.ebuild b/dev-util/mv_perl/mv_perl-3.16.ebuild
index be75de90..06bb6e8c 100644
--- a/dev-util/mv_perl/mv_perl-3.16.ebuild
+++ b/dev-util/mv_perl/mv_perl-3.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # These should really depend on USE-flags but must not by policy.
diff --git a/dev-util/pyrep/pyrep-1.5-r1.ebuild b/dev-util/pyrep/pyrep-1.5-r1.ebuild
index 161c0fd6..dc53ffc1 100644
--- a/dev-util/pyrep/pyrep-1.5-r1.ebuild
+++ b/dev-util/pyrep/pyrep-1.5-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-lang/python"
diff --git a/dev-util/replacer/replacer-3.1-r1.ebuild b/dev-util/replacer/replacer-3.1-r1.ebuild
index 900908bb..fe8080e4 100644
--- a/dev-util/replacer/replacer-3.1-r1.ebuild
+++ b/dev-util/replacer/replacer-3.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 PLOCALES="de"
 for i in ${PLOCALES}; do
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
index bea82cc5..48e733cf 100644
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
+++ b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lua-slotted"
 
 RDEPEND="
diff --git a/games-rpg/dsa-stats/dsa-stats-1.0.ebuild b/games-rpg/dsa-stats/dsa-stats-1.0.ebuild
index b778fd8f..355ca371 100644
--- a/games-rpg/dsa-stats/dsa-stats-1.0.ebuild
+++ b/games-rpg/dsa-stats/dsa-stats-1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/games-rpg/m5figur-mv/m5figur-mv-4.0.ebuild b/games-rpg/m5figur-mv/m5figur-mv-4.0.ebuild
index dd5740eb..9b65b1dc 100644
--- a/games-rpg/m5figur-mv/m5figur-mv-4.0.ebuild
+++ b/games-rpg/m5figur-mv/m5figur-mv-4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LPPL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+examples"
 # We need texlive-latexextra for toolbox.sty
 DEPEND="virtual/latex-base"
diff --git a/media-gfx/ipe/ipe-7.2.7.ebuild b/media-gfx/ipe/ipe-7.2.7.ebuild
index aae0231f..e34589e3 100644
--- a/media-gfx/ipe/ipe-7.2.7.ebuild
+++ b/media-gfx/ipe/ipe-7.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dl.bintray.com/otfried/generic/ipe/7.2/${P}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/pqiv/pqiv-2.10.4.ebuild b/media-gfx/pqiv/pqiv-2.10.4.ebuild
index f8248cd7..241b2caa 100644
--- a/media-gfx/pqiv/pqiv-2.10.4.ebuild
+++ b/media-gfx/pqiv/pqiv-2.10.4.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit linux-info toolchain-funcs xdg-utils
 
 SRC_URI="https://github.com/phillipberndt/pqiv/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DESCRIPTION="powerful GTK based command-line image viewer with a minimal UI"
 HOMEPAGE="https://github.com/phillipberndt/pqiv http://www.pberndt.com/Programme/Linux/pqiv/"
diff --git a/media-tv/sundtek-tv/sundtek-tv-181004.184248.ebuild b/media-tv/sundtek-tv/sundtek-tv-181004.184248.ebuild
index 8ee8be07..8ce8d456 100644
--- a/media-tv/sundtek-tv/sundtek-tv-181004.184248.ebuild
+++ b/media-tv/sundtek-tv/sundtek-tv-181004.184248.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.sundtek.de/media/sundtek_installer_${PV}.sh"
 RESTRICT="binchecks mirror strip"
 LICENSE="sundtek"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ld-preload-env +ld-preload-file pax_kernel"
 RDEPEND="!<sys-apps/openrc-0.13"
 BDEPEND="pax_kernel? ( || ( sys-apps/elfix sys-apps/paxctl ) )"
diff --git a/media-tv/w_scan/w_scan-20170107-r1.ebuild b/media-tv/w_scan/w_scan-20170107-r1.ebuild
index cce62f29..320086ef 100644
--- a/media-tv/w_scan/w_scan-20170107-r1.ebuild
+++ b/media-tv/w_scan/w_scan-20170107-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wirbel.htpc-forum.de/w_scan/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +plp-id-zero"
 
 DEPEND=">=virtual/linuxtv-dvb-headers-5.8"
diff --git a/media-video/video-mv/video-mv-13.0.ebuild b/media-video/video-mv/video-mv-13.0.ebuild
index 0c0ccb9a..49f58bed 100644
--- a/media-video/video-mv/video-mv-13.0.ebuild
+++ b/media-video/video-mv/video-mv-13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # This should really depend on a USE-flag but must not by policy.
diff --git a/net-dialup/accounting/accounting-1.60.45.3.1-r1.ebuild b/net-dialup/accounting/accounting-1.60.45.3.1-r1.ebuild
index d6fdbf74..c9f9fc4f 100644
--- a/net-dialup/accounting/accounting-1.60.45.3.1-r1.ebuild
+++ b/net-dialup/accounting/accounting-1.60.45.3.1-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="http://download.opensuse.org/source/distribution/11.3/repo/oss/suse/src
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 : ${ACCOUNTING_LOG:="/var/log/accounting.log"}
diff --git a/net-firewall/firewall-mv/firewall-mv-13.0-r1.ebuild b/net-firewall/firewall-mv/firewall-mv-13.0-r1.ebuild
index 51a1ff39..41d09cc3 100644
--- a/net-firewall/firewall-mv/firewall-mv-13.0-r1.ebuild
+++ b/net-firewall/firewall-mv/firewall-mv-13.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=app-shells/push-2.0-r2"
 DEPEND=""
diff --git a/net-misc/sshstart/sshstart-4.7.ebuild b/net-misc/sshstart/sshstart-4.7.ebuild
index 5e0323be..b08549f7 100644
--- a/net-misc/sshstart/sshstart-4.7.ebuild
+++ b/net-misc/sshstart/sshstart-4.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=app-shells/push-2.0-r2
 	!<dev-vcs/git-wrappers-2.0"
diff --git a/sci-mathematics/genius/genius-1.0.21.ebuild b/sci-mathematics/genius/genius-1.0.21.ebuild
index fb7a0087..90c62479 100644
--- a/sci-mathematics/genius/genius-1.0.21.ebuild
+++ b/sci-mathematics/genius/genius-1.0.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc gnome nls"
 
 RDEPEND="
diff --git a/sys-apps/cpi/cpi-3.1.ebuild b/sys-apps/cpi/cpi-3.1.ebuild
index f86af1a5..5401092d 100644
--- a/sys-apps/cpi/cpi-3.1.ebuild
+++ b/sys-apps/cpi/cpi-3.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/sys-apps/paxopen/paxopen-1.2.ebuild b/sys-apps/paxopen/paxopen-1.2.ebuild
index 3df06d7d..9857932c 100644
--- a/sys-apps/paxopen/paxopen-1.2.ebuild
+++ b/sys-apps/paxopen/paxopen-1.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_install() {
diff --git a/sys-apps/schedule/schedule-8.0-r1.ebuild b/sys-apps/schedule/schedule-8.0-r1.ebuild
index f5a9519e..3b28c3d0 100644
--- a/sys-apps/schedule/schedule-8.0-r1.ebuild
+++ b/sys-apps/schedule/schedule-8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # These should really depend on USE-flags but must not by policy.
diff --git a/sys-apps/starter/starter-3.0.ebuild b/sys-apps/starter/starter-3.0.ebuild
index db667550..77cdc9f9 100644
--- a/sys-apps/starter/starter-3.0.ebuild
+++ b/sys-apps/starter/starter-3.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=app-shells/push-2.0-r2
 	>=app-shells/runtitle-2.3"
diff --git a/sys-fs/emount/emount-3.0.4.ebuild b/sys-fs/emount/emount-3.0.4.ebuild
index d6dce54a..fa210ae0 100644
--- a/sys-fs/emount/emount-3.0.4.ebuild
+++ b/sys-fs/emount/emount-3.0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # This should really depend on a USE-flag but must not by policy.
diff --git a/sys-kernel/kccmp/kccmp-0.3-r1.ebuild b/sys-kernel/kccmp/kccmp-0.3-r1.ebuild
index 8e16fdb0..e9cedfa7 100644
--- a/sys-kernel/kccmp/kccmp-0.3-r1.ebuild
+++ b/sys-kernel/kccmp/kccmp-0.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://stoopidsimple.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-qt/qtcore:5
diff --git a/sys-kernel/kernel/kernel-4.8.ebuild b/sys-kernel/kernel/kernel-4.8.ebuild
index 9b81afda..8a486e44 100644
--- a/sys-kernel/kernel/kernel-4.8.ebuild
+++ b/sys-kernel/kernel/kernel-4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # This should really depend on a USE-flag but must not by policy.
diff --git a/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild b/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild
index 7cab58b2..aade82e5 100644
--- a/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild
+++ b/www-plugins/bookmark-dupes/bookmark-dupes-5.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/870263/${PN//-/_}-${PV
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/calc-extension/calc-extension-5.1.ebuild b/www-plugins/calc-extension/calc-extension-5.1.ebuild
index 06eee088..06e21cf3 100644
--- a/www-plugins/calc-extension/calc-extension-5.1.ebuild
+++ b/www-plugins/calc-extension/calc-extension-5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/937719/${PN//-/_}-${PV
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/canvasblocker/canvasblocker-0.5.3.ebuild b/www-plugins/canvasblocker/canvasblocker-0.5.3.ebuild
index d1294db2..102ee911 100644
--- a/www-plugins/canvasblocker/canvasblocker-0.5.3.ebuild
+++ b/www-plugins/canvasblocker/canvasblocker-0.5.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/534930/${PN//-/_}-${PV
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/dark-mode/dark-mode-0.2.8.ebuild b/www-plugins/dark-mode/dark-mode-0.2.8.ebuild
index 93e694e7..0dc6b2dd 100644
--- a/www-plugins/dark-mode/dark-mode-0.2.8.ebuild
+++ b/www-plugins/dark-mode/dark-mode-0.2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/786990/${PN//-/_}_webe
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults -i'{174b2d58-b983-4501-ab4b-07e71203cb43}' firefox seamonkey
diff --git a/www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild b/www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild
index 99afde8e..f89d8b91 100644
--- a/www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild
+++ b/www-plugins/decentraleyes/decentraleyes-2.0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/521554/${PN//-/_}-${PV
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/duckduckgo/duckduckgo-2018.9.14.ebuild b/www-plugins/duckduckgo/duckduckgo-2018.9.14.ebuild
index 683cb76b..4a430c1b 100644
--- a/www-plugins/duckduckgo/duckduckgo-2018.9.14.ebuild
+++ b/www-plugins/duckduckgo/duckduckgo-2018.9.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/385621/${mPN}-an+fx.xp
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults '>=firefox-57' seamonkey
diff --git a/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild b/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild
index 693c351f..ac224e3c 100644
--- a/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild
+++ b/www-plugins/epubreader/epubreader-2.0.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/45281/${P}-an+fx.xpi"
 
 LICENSE="epubreader"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults -i'{5384767E-00D9-40E9-B72F-9CC39D655D6F}' firefox seamonkey
diff --git a/www-plugins/form-history-control/form-history-control-2.2.0.0.ebuild b/www-plugins/form-history-control/form-history-control-2.2.0.0.ebuild
index 51967810..d70d9e1a 100644
--- a/www-plugins/form-history-control/form-history-control-2.2.0.0.ebuild
+++ b/www-plugins/form-history-control/form-history-control-2.2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.mozilla.org/firefox/downloads/file/769035/${PN//-/_}-${P
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/google-translation/google-translation-2.6.ebuild b/www-plugins/google-translation/google-translation-2.6.ebuild
index 96217c78..f819ab87 100644
--- a/www-plugins/google-translation/google-translation-2.6.ebuild
+++ b/www-plugins/google-translation/google-translation-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/727175/${PN//-/_}-${PV
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 INSTALL_ID='gtranslation2@slam.com'
diff --git a/www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.1.ebuild b/www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.1.ebuild
index 45e99bd9..8bef0ab3 100644
--- a/www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.1.ebuild
+++ b/www-plugins/google-translator-for-firefox/google-translator-for-firefox-3.0.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/46308/google_translato
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/https-everywhere/https-everywhere-2018.8.22.ebuild b/www-plugins/https-everywhere/https-everywhere-2018.8.22.ebuild
index 93e27369..430ff03b 100644
--- a/www-plugins/https-everywhere/https-everywhere-2018.8.22.ebuild
+++ b/www-plugins/https-everywhere/https-everywhere-2018.8.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/229918/${PN//-/_}-${PV
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/no-color/no-color-0.9.4.ebuild b/www-plugins/no-color/no-color-0.9.4.ebuild
index f7cc0cbc..99382e8a 100644
--- a/www-plugins/no-color/no-color-0.9.4.ebuild
+++ b/www-plugins/no-color/no-color-0.9.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/5758/${PN//-/_}-${PV}-
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/noscript/noscript-10.1.9.6.ebuild b/www-plugins/noscript/noscript-10.1.9.6.ebuild
index 7546cddd..23b7049b 100644
--- a/www-plugins/noscript/noscript-10.1.9.6.ebuild
+++ b/www-plugins/noscript/noscript-10.1.9.6.ebuild
@@ -12,7 +12,7 @@ https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults '>=firefox-59' seamonkey
diff --git a/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild b/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild
index b737023c..91d61968 100644
--- a/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild
+++ b/www-plugins/skip-redirect/skip-redirect-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/642100/${PN//-/_}-${PV
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey
diff --git a/www-plugins/translate-to-me/translate-to-me-1.1.ebuild b/www-plugins/translate-to-me/translate-to-me-1.1.ebuild
index 106d38ec..33d75b2a 100644
--- a/www-plugins/translate-to-me/translate-to-me-1.1.ebuild
+++ b/www-plugins/translate-to-me/translate-to-me-1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/759684/traduza_para_mi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 INSTALL_ID='{e415fbdf-7d9b-4c89-bbf2-be52b470b1c1}'
diff --git a/www-plugins/ublock-origin/ublock-origin-1.16.20.ebuild b/www-plugins/ublock-origin/ublock-origin-1.16.20.ebuild
index 8f559a25..31dbff13 100644
--- a/www-plugins/ublock-origin/ublock-origin-1.16.20.ebuild
+++ b/www-plugins/ublock-origin/ublock-origin-1.16.20.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://addons.cdn.mozilla.net/user-media/addons/607454/${PN//-/_}-${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 moz_defaults firefox seamonkey