[gentoo-commits] repo/gentoo:master commit in: sys-devel/binutils-config/, sys-devel/gcc/, sys-devel/autoconf-archive/, ...

[Michał Górny]

commit:     7cff1321b5dcf3c54d072cc49fc1b9c47e8334fc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 15:37:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 15:37:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cff1321

sys-devel: Remove *-fbsd KEYWORDS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild | 2 +-
 sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild      | 2 +-
 sys-devel/autoconf/autoconf-2.13-r1.ebuild                    | 2 +-
 sys-devel/autoconf/autoconf-2.64-r1.ebuild                    | 2 +-
 sys-devel/autoconf/autoconf-2.69-r4.ebuild                    | 2 +-
 sys-devel/autoconf/autoconf-9999.ebuild                       | 2 +-
 sys-devel/autogen/autogen-5.18.10.ebuild                      | 2 +-
 sys-devel/autogen/autogen-5.18.12.ebuild                      | 2 +-
 sys-devel/autogen/autogen-5.18.16-r1.ebuild                   | 2 +-
 sys-devel/autogen/autogen-5.18.16.ebuild                      | 2 +-
 sys-devel/autogen/autogen-5.18.4-r1.ebuild                    | 2 +-
 sys-devel/autogen/autogen-5.18.4.ebuild                       | 2 +-
 sys-devel/automake-wrapper/automake-wrapper-10.ebuild         | 2 +-
 sys-devel/automake-wrapper/automake-wrapper-11.ebuild         | 2 +-
 sys-devel/automake/automake-1.10.3-r3.ebuild                  | 2 +-
 sys-devel/automake/automake-1.11.6-r3.ebuild                  | 2 +-
 sys-devel/automake/automake-1.12.6-r2.ebuild                  | 2 +-
 sys-devel/automake/automake-1.13.4-r2.ebuild                  | 2 +-
 sys-devel/automake/automake-1.14.1-r2.ebuild                  | 2 +-
 sys-devel/automake/automake-1.15.1-r2.ebuild                  | 2 +-
 sys-devel/automake/automake-1.16-r2.ebuild                    | 2 +-
 sys-devel/automake/automake-1.16.1-r1.ebuild                  | 2 +-
 sys-devel/automake/automake-1.4_p6-r2.ebuild                  | 2 +-
 sys-devel/automake/automake-1.5-r2.ebuild                     | 2 +-
 sys-devel/automake/automake-1.6.3-r2.ebuild                   | 2 +-
 sys-devel/automake/automake-1.7.9-r3.ebuild                   | 2 +-
 sys-devel/automake/automake-1.8.5-r5.ebuild                   | 2 +-
 sys-devel/automake/automake-1.9.6-r5.ebuild                   | 2 +-
 sys-devel/automake/automake-9999.ebuild                       | 2 +-
 sys-devel/bc/bc-1.06.95-r2.ebuild                             | 2 +-
 sys-devel/bc/bc-1.07.1-r1.ebuild                              | 2 +-
 sys-devel/bc/bc-1.07.1-r2.ebuild                              | 2 +-
 sys-devel/bin86/bin86-0.16.20-r2.ebuild                       | 2 +-
 sys-devel/bin86/bin86-0.16.21.ebuild                          | 2 +-
 sys-devel/binutils-config/binutils-config-5-r4.ebuild         | 2 +-
 sys-devel/binutils-config/binutils-config-5.1-r1.ebuild       | 2 +-
 sys-devel/binutils/binutils-2.26.1.ebuild                     | 2 +-
 sys-devel/binutils/binutils-2.27-r1.ebuild                    | 2 +-
 sys-devel/binutils/binutils-2.28.1.ebuild                     | 2 +-
 sys-devel/binutils/binutils-2.29.1-r1.ebuild                  | 2 +-
 sys-devel/binutils/binutils-2.30-r4.ebuild                    | 2 +-
 sys-devel/binutils/binutils-2.31.1-r6.ebuild                  | 2 +-
 sys-devel/binutils/binutils-2.32-r1.ebuild                    | 2 +-
 sys-devel/bison/bison-3.1.ebuild                              | 2 +-
 sys-devel/bison/bison-3.2.4.ebuild                            | 2 +-
 sys-devel/bison/bison-3.3.2.ebuild                            | 2 +-
 sys-devel/bison/bison-3.4.1.ebuild                            | 2 +-
 sys-devel/bison/bison-3.4.2.ebuild                            | 2 +-
 sys-devel/clang-common/clang-common-6.0.1.ebuild              | 2 +-
 sys-devel/clang-common/clang-common-7.1.0.ebuild              | 2 +-
 sys-devel/clang-common/clang-common-8.0.0.ebuild              | 2 +-
 sys-devel/clang-common/clang-common-8.0.1.ebuild              | 2 +-
 sys-devel/clang-common/clang-common-9.0.0.ebuild              | 2 +-
 sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild            | 2 +-
 sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild            | 2 +-
 sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild            | 2 +-
 sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild            | 2 +-
 sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild            | 2 +-
 sys-devel/clang/clang-6.0.1.ebuild                            | 2 +-
 sys-devel/clang/clang-7.1.0.ebuild                            | 2 +-
 sys-devel/clang/clang-8.0.0.ebuild                            | 2 +-
 sys-devel/clang/clang-8.0.1.ebuild                            | 2 +-
 sys-devel/clang/clang-9.0.0.ebuild                            | 2 +-
 sys-devel/crossdev/crossdev-20181020.ebuild                   | 2 +-
 sys-devel/crossdev/crossdev-20181202.ebuild                   | 2 +-
 sys-devel/crossdev/crossdev-20190311.ebuild                   | 2 +-
 sys-devel/crossdev/crossdev-20190712.ebuild                   | 2 +-
 sys-devel/crossdev/crossdev-20190901.ebuild                   | 2 +-
 sys-devel/crossdev/crossdev-20190908.ebuild                   | 2 +-
 sys-devel/crossdev/crossdev-99999999.ebuild                   | 2 +-
 sys-devel/flex/flex-2.6.1.ebuild                              | 2 +-
 sys-devel/flex/flex-2.6.3-r1.ebuild                           | 2 +-
 sys-devel/flex/flex-2.6.3.ebuild                              | 2 +-
 sys-devel/flex/flex-2.6.4-r1.ebuild                           | 2 +-
 sys-devel/flex/flex-2.6.4.ebuild                              | 2 +-
 sys-devel/gcc-config/gcc-config-2.0.ebuild                    | 2 +-
 sys-devel/gcc-config/gcc-config-2.1.ebuild                    | 2 +-
 sys-devel/gcc-config/gcc-config-9999.ebuild                   | 2 +-
 sys-devel/gcc/gcc-3.4.6-r2.ebuild                             | 2 +-
 sys-devel/gcc/gcc-3.4.6-r3.ebuild                             | 2 +-
 sys-devel/gcc/gcc-3.4.6-r4.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.1.2-r2.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.1.2.ebuild                                | 2 +-
 sys-devel/gcc/gcc-4.2.4-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.2.4-r3.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.3.6-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.3.6-r3.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.4.7-r2.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.4.7.ebuild                                | 2 +-
 sys-devel/gcc/gcc-4.5.4-r2.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.5.4.ebuild                                | 2 +-
 sys-devel/gcc/gcc-4.6.4-r2.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.6.4.ebuild                                | 2 +-
 sys-devel/gcc/gcc-4.8.5-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.8.5-r3.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.9.4-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-4.9.4.ebuild                                | 2 +-
 sys-devel/gcc/gcc-5.4.0-r4.ebuild                             | 2 +-
 sys-devel/gcc/gcc-5.4.0-r6.ebuild                             | 2 +-
 sys-devel/gcc/gcc-5.5.0.ebuild                                | 2 +-
 sys-devel/gcc/gcc-6.4.0-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-6.4.0-r5.ebuild                             | 2 +-
 sys-devel/gcc/gcc-6.5.0-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-7.3.0-r3.ebuild                             | 2 +-
 sys-devel/gcc/gcc-7.3.0-r6.ebuild                             | 2 +-
 sys-devel/gcc/gcc-7.4.0-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-7.4.0-r2.ebuild                             | 2 +-
 sys-devel/gcc/gcc-8.2.0-r5.ebuild                             | 2 +-
 sys-devel/gcc/gcc-8.2.0-r6.ebuild                             | 2 +-
 sys-devel/gcc/gcc-8.3.0-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-8.3.0-r2.ebuild                             | 2 +-
 sys-devel/gcc/gcc-8.3.0.ebuild                                | 2 +-
 sys-devel/gcc/gcc-9.1.0-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-9.1.0.ebuild                                | 2 +-
 sys-devel/gcc/gcc-9.2.0-r1.ebuild                             | 2 +-
 sys-devel/gcc/gcc-9.2.0.ebuild                                | 2 +-
 sys-devel/gdb/gdb-8.3.1.ebuild                                | 2 +-
 sys-devel/gdb/gdb-8.3.ebuild                                  | 2 +-
 sys-devel/gdb/gdb-9999.ebuild                                 | 2 +-
 sys-devel/gettext/gettext-0.19.8.1.ebuild                     | 2 +-
 sys-devel/gettext/gettext-0.20.1.ebuild                       | 2 +-
 sys-devel/gnuconfig/gnuconfig-20170101.ebuild                 | 2 +-
 sys-devel/gnuconfig/gnuconfig-20180101.ebuild                 | 2 +-
 sys-devel/gnuconfig/gnuconfig-20190804.ebuild                 | 2 +-
 sys-devel/gnuconfig/gnuconfig-99999999.ebuild                 | 2 +-
 sys-devel/libtool/libtool-2.4.6-r3.ebuild                     | 2 +-
 sys-devel/libtool/libtool-2.4.6-r4.ebuild                     | 2 +-
 sys-devel/libtool/libtool-2.4.6-r5.ebuild                     | 2 +-
 sys-devel/libtool/libtool-9999.ebuild                         | 2 +-
 sys-devel/lld/lld-6.0.1.ebuild                                | 2 +-
 sys-devel/lld/lld-7.1.0.ebuild                                | 2 +-
 sys-devel/lld/lld-8.0.0.ebuild                                | 2 +-
 sys-devel/lld/lld-8.0.1.ebuild                                | 2 +-
 sys-devel/lld/lld-9.0.0.ebuild                                | 2 +-
 sys-devel/llvm-common/llvm-common-6.0.1.ebuild                | 2 +-
 sys-devel/llvm-common/llvm-common-7.1.0.ebuild                | 2 +-
 sys-devel/llvm-common/llvm-common-8.0.0.ebuild                | 2 +-
 sys-devel/llvm-common/llvm-common-8.0.1.ebuild                | 2 +-
 sys-devel/llvm-common/llvm-common-9.0.0.ebuild                | 2 +-
 sys-devel/llvm/llvm-6.0.1-r2.ebuild                           | 2 +-
 sys-devel/llvm/llvm-6.0.1.ebuild                              | 2 +-
 sys-devel/llvm/llvm-7.1.0.ebuild                              | 2 +-
 sys-devel/llvm/llvm-8.0.0.ebuild                              | 2 +-
 sys-devel/llvm/llvm-8.0.1.ebuild                              | 2 +-
 sys-devel/llvm/llvm-9.0.0.ebuild                              | 2 +-
 sys-devel/m4/m4-1.4.17.ebuild                                 | 2 +-
 sys-devel/m4/m4-1.4.18-r1.ebuild                              | 2 +-
 sys-devel/make/make-4.2.1-r4.ebuild                           | 2 +-
 sys-devel/patch/patch-2.7.6-r4.ebuild                         | 2 +-
 sys-devel/qconf/qconf-2.3.ebuild                              | 2 +-
 sys-devel/qconf/qconf-2.4.ebuild                              | 2 +-
 151 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild 
b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
index 9d943467d26..4afd97d7cbf 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2019.01.06.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246

diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild 
b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
index b826052405e..d8ca4b7c25e 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"

diff --git a/sys-devel/autoconf/autoconf-2.13-r1.ebuild 
b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
index 5b2a5e4cba3..41be79aff81 100644
--- a/sys-devel/autoconf/autoconf-2.13-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="userland_BSD"
 
 DEPEND=">=sys-apps/texinfo-4.3

diff --git a/sys-devel/autoconf/autoconf-2.64-r1.ebuild 
b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
index e02c4244778..146216a4cbd 100644
--- a/sys-devel/autoconf/autoconf-2.64-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.64-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86"
 IUSE=""
 
 DEPEND=">=sys-devel/m4-1.4.6

diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild 
b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index ea60fe3c096..b4362d47d8e 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
        SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
                ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz";
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 fi
 
 inherit toolchain-autoconf

diff --git a/sys-devel/autoconf/autoconf-9999.ebuild 
b/sys-devel/autoconf/autoconf-9999.ebuild
index ba8369fc077..f728a1a9f57 100644
--- a/sys-devel/autoconf/autoconf-9999.ebuild
+++ b/sys-devel/autoconf/autoconf-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
        SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
                ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
 fi
 
 inherit toolchain-autoconf

diff --git a/sys-devel/autogen/autogen-5.18.10.ebuild 
b/sys-devel/autogen/autogen-5.18.10.ebuild
index 80f6624da10..ddb0e9c23cc 100644
--- a/sys-devel/autogen/autogen-5.18.10.ebuild
+++ b/sys-devel/autogen/autogen-5.18.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 # This should be guile-1.8+, but upstream has a bug with older versions:

diff --git a/sys-devel/autogen/autogen-5.18.12.ebuild 
b/sys-devel/autogen/autogen-5.18.12.ebuild
index 7ff8c363271..eebface9f0f 100644
--- a/sys-devel/autogen/autogen-5.18.12.ebuild
+++ b/sys-devel/autogen/autogen-5.18.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 # This should be guile-1.8+, but upstream has a bug with older versions:

diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild 
b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index b2f45d68237..a10a119e2d2 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=

diff --git a/sys-devel/autogen/autogen-5.18.16.ebuild 
b/sys-devel/autogen/autogen-5.18.16.ebuild
index 820e21bfa5a..602970a7a5f 100644
--- a/sys-devel/autogen/autogen-5.18.16.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-2.0:=

diff --git a/sys-devel/autogen/autogen-5.18.4-r1.ebuild 
b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
index cd333f3f0d6..4e8ebe88601 100644
--- a/sys-devel/autogen/autogen-5.18.4-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND="

diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild 
b/sys-devel/autogen/autogen-5.18.4.ebuild
index 5787d2af660..df05f7d08a3 100644
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libopts static-libs"
 
 RDEPEND=">=dev-scheme/guile-1.8

diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild 
b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
index 986b1e36f94..4b970639eae 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}

diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild 
b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
index 24cc3a9729c..3d398a8dd31 100644
--- a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S=${WORKDIR}

diff --git a/sys-devel/automake/automake-1.10.3-r3.ebuild 
b/sys-devel/automake/automake-1.10.3-r3.ebuild
index 015bc188bdf..87cde0031df 100644
--- a/sys-devel/automake/automake-1.10.3-r3.ebuild
+++ b/sys-devel/automake/automake-1.10.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/automake/automake-1.11.6-r3.ebuild 
b/sys-devel/automake/automake-1.11.6-r3.ebuild
index e9ac868dd30..5b7598bf3a2 100644
--- a/sys-devel/automake/automake-1.11.6-r3.ebuild
+++ b/sys-devel/automake/automake-1.11.6-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/automake/automake-1.12.6-r2.ebuild 
b/sys-devel/automake/automake-1.12.6-r2.ebuild
index d80bcbe651e..19980a85004 100644
--- a/sys-devel/automake/automake-1.12.6-r2.ebuild
+++ b/sys-devel/automake/automake-1.12.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/automake/automake-1.13.4-r2.ebuild 
b/sys-devel/automake/automake-1.13.4-r2.ebuild
index 5474860454b..0f3ddda5732 100644
--- a/sys-devel/automake/automake-1.13.4-r2.ebuild
+++ b/sys-devel/automake/automake-1.13.4-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/automake/automake-1.14.1-r2.ebuild 
b/sys-devel/automake/automake-1.14.1-r2.ebuild
index 86b068329b3..9d459dca58d 100644
--- a/sys-devel/automake/automake-1.14.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.14.1-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.gnu.org/software/automake/";
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-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 ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/automake/automake-1.15.1-r2.ebuild 
b/sys-devel/automake/automake-1.15.1-r2.ebuild
index 239f42ab64b..2bb05e601da 100644
--- a/sys-devel/automake/automake-1.15.1-r2.ebuild
+++ b/sys-devel/automake/automake-1.15.1-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
        inherit git-r3
 else
-       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 ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
        if [[ ${PV/_beta} == ${PV} ]]; then
                MY_P=${P}
                SRC_URI="mirror://gnu/${PN}/${P}.tar.xz

diff --git a/sys-devel/automake/automake-1.16-r2.ebuild 
b/sys-devel/automake/automake-1.16-r2.ebuild
index 3eac147a2de..d0738fdbefd 100644
--- a/sys-devel/automake/automake-1.16-r2.ebuild
+++ b/sys-devel/automake/automake-1.16-r2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
        inherit git-r3
 else
-       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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
        if [[ ${PV/_beta} == ${PV} ]]; then
                MY_P=${P}
                SRC_URI="mirror://gnu/${PN}/${P}.tar.xz

diff --git a/sys-devel/automake/automake-1.16.1-r1.ebuild 
b/sys-devel/automake/automake-1.16.1-r1.ebuild
index a3b65cc2b2a..ffda1b05bf8 100644
--- a/sys-devel/automake/automake-1.16.1-r1.ebuild
+++ b/sys-devel/automake/automake-1.16.1-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
        inherit git-r3
 else
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
        if [[ ${PV/_beta} == ${PV} ]]; then
                MY_P=${P}
                SRC_URI="mirror://gnu/${PN}/${P}.tar.xz

diff --git a/sys-devel/automake/automake-1.4_p6-r2.ebuild 
b/sys-devel/automake/automake-1.4_p6-r2.ebuild
index 80d58e97e82..6bb6383d3e2 100644
--- a/sys-devel/automake/automake-1.4_p6-r2.ebuild
+++ b/sys-devel/automake/automake-1.4_p6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl

diff --git a/sys-devel/automake/automake-1.5-r2.ebuild 
b/sys-devel/automake/automake-1.5-r2.ebuild
index 8edbe1ad198..ffe3557ac6a 100644
--- a/sys-devel/automake/automake-1.5-r2.ebuild
+++ b/sys-devel/automake/automake-1.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl

diff --git a/sys-devel/automake/automake-1.6.3-r2.ebuild 
b/sys-devel/automake/automake-1.6.3-r2.ebuild
index 8df177642d4..28dc45083bd 100644
--- a/sys-devel/automake/automake-1.6.3-r2.ebuild
+++ b/sys-devel/automake/automake-1.6.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl

diff --git a/sys-devel/automake/automake-1.7.9-r3.ebuild 
b/sys-devel/automake/automake-1.7.9-r3.ebuild
index 5a1cc2feec8..ae81a6d4b1c 100644
--- a/sys-devel/automake/automake-1.7.9-r3.ebuild
+++ b/sys-devel/automake/automake-1.7.9-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl

diff --git a/sys-devel/automake/automake-1.8.5-r5.ebuild 
b/sys-devel/automake/automake-1.8.5-r5.ebuild
index ed3291d3499..6e364d2599c 100644
--- a/sys-devel/automake/automake-1.8.5-r5.ebuild
+++ b/sys-devel/automake/automake-1.8.5-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl

diff --git a/sys-devel/automake/automake-1.9.6-r5.ebuild 
b/sys-devel/automake/automake-1.9.6-r5.ebuild
index 432665df701..44f7d05137c 100644
--- a/sys-devel/automake/automake-1.9.6-r5.ebuild
+++ b/sys-devel/automake/automake-1.9.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/automake/automake-9999.ebuild 
b/sys-devel/automake/automake-9999.ebuild
index 9048f1838d5..6932450d2cc 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 
        inherit git-r3
 else
-       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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
        if [[ ${PV/_beta} == ${PV} ]]; then
                MY_P=${P}
                SRC_URI="mirror://gnu/${PN}/${P}.tar.xz

diff --git a/sys-devel/bc/bc-1.06.95-r2.ebuild 
b/sys-devel/bc/bc-1.06.95-r2.ebuild
index 502df269eb6..c035526f337 100644
--- a/sys-devel/bc/bc-1.06.95-r2.ebuild
+++ b/sys-devel/bc/bc-1.06.95-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/bc/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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 ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="

diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild
index 4421c82a810..14f6c1f6911 100644
--- a/sys-devel/bc/bc-1.07.1-r1.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="libedit readline static"
 
 RDEPEND="

diff --git a/sys-devel/bc/bc-1.07.1-r2.ebuild b/sys-devel/bc/bc-1.07.1-r2.ebuild
index 556842fcb69..14782c7a397 100644
--- a/sys-devel/bc/bc-1.07.1-r2.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="forced-sandbox libedit readline static"
 
 RDEPEND="

diff --git a/sys-devel/bin86/bin86-0.16.20-r2.ebuild 
b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
index 5bb161c54a2..9e0088919ee 100644
--- a/sys-devel/bin86/bin86-0.16.20-r2.ebuild
+++ b/sys-devel/bin86/bin86-0.16.20-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE=""
 
 src_prepare() {

diff --git a/sys-devel/bin86/bin86-0.16.21.ebuild 
b/sys-devel/bin86/bin86-0.16.21.ebuild
index 189d5bc75ed..3e67dfb8467 100644
--- a/sys-devel/bin86/bin86-0.16.21.ebuild
+++ b/sys-devel/bin86/bin86-0.16.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v3.sk/~lkundrak/dev86/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE=""
 
 src_prepare() {

diff --git a/sys-devel/binutils-config/binutils-config-5-r4.ebuild 
b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
index 39263f45c28..db54488baf1 100644
--- a/sys-devel/binutils-config/binutils-config-5-r4.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system

diff --git a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild 
b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
index 57434c023ce..8c430975bc5 100644
--- a/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86"
 IUSE=""
 
 # We also RDEPEND on sys-apps/findutils which is in base @system

diff --git a/sys-devel/binutils/binutils-2.26.1.ebuild 
b/sys-devel/binutils/binutils-2.26.1.ebuild
index 3ed6372c313..e3892466c1c 100644
--- a/sys-devel/binutils/binutils-2.26.1.ebuild
+++ b/sys-devel/binutils/binutils-2.26.1.ebuild
@@ -7,4 +7,4 @@ PATCHVER="1.0"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"

diff --git a/sys-devel/binutils/binutils-2.27-r1.ebuild 
b/sys-devel/binutils/binutils-2.27-r1.ebuild
index f969f492cdd..a036cfc9ed4 100644
--- a/sys-devel/binutils/binutils-2.27-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.27-r1.ebuild
@@ -7,4 +7,4 @@ PATCHVER="1.1"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"

diff --git a/sys-devel/binutils/binutils-2.28.1.ebuild 
b/sys-devel/binutils/binutils-2.28.1.ebuild
index 3ed6372c313..e3892466c1c 100644
--- a/sys-devel/binutils/binutils-2.28.1.ebuild
+++ b/sys-devel/binutils/binutils-2.28.1.ebuild
@@ -7,4 +7,4 @@ PATCHVER="1.0"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"

diff --git a/sys-devel/binutils/binutils-2.29.1-r1.ebuild 
b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
index 5345e72a888..73230fd9e6a 100644
--- a/sys-devel/binutils/binutils-2.29.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
@@ -7,6 +7,6 @@ PATCHVER="3"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc 
x86"
 
 PATCHES=( "${FILESDIR}/${P}-nogoldtest.patch" )

diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild 
b/sys-devel/binutils/binutils-2.30-r4.ebuild
index 80940330383..a64424ccd02 100644
--- a/sys-devel/binutils/binutils-2.30-r4.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r4.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
                ;;
 esac
 SLOT="${BVER}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 
 #
 # The Gentoo patchset

diff --git a/sys-devel/binutils/binutils-2.31.1-r6.ebuild 
b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
index b07c5579b0d..511d497ac38 100644
--- a/sys-devel/binutils/binutils-2.31.1-r6.ebuild
+++ b/sys-devel/binutils/binutils-2.31.1-r6.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
        *)
                SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
                SLOT=$(get_version_component_range 1-2)
-               KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 
s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+               KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 
s390 sh sparc x86"
                ;;
 esac
 

diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild 
b/sys-devel/binutils/binutils-2.32-r1.ebuild
index 184c0d38265..ac19c27ce3e 100644
--- a/sys-devel/binutils/binutils-2.32-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.32-r1.ebuild
@@ -45,7 +45,7 @@ case ${PV} in
        *)
                SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
                SLOT=$(get_version_component_range 1-2)
-               KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 
~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+               KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 
~riscv s390 sh sparc x86"
                ;;
 esac
 

diff --git a/sys-devel/bison/bison-3.1.ebuild b/sys-devel/bison/bison-3.1.ebuild
index be1712c5445..837f2d7c557 100644
--- a/sys-devel/bison/bison-3.1.ebuild
+++ b/sys-devel/bison/bison-3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-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 ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"

diff --git a/sys-devel/bison/bison-3.2.4.ebuild 
b/sys-devel/bison/bison-3.2.4.ebuild
index 4d3d12b7fd0..0357b2808cf 100644
--- a/sys-devel/bison/bison-3.2.4.ebuild
+++ b/sys-devel/bison/bison-3.2.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"

diff --git a/sys-devel/bison/bison-3.3.2.ebuild 
b/sys-devel/bison/bison-3.3.2.ebuild
index 0152b3a3c35..365abc303bf 100644
--- a/sys-devel/bison/bison-3.3.2.ebuild
+++ b/sys-devel/bison/bison-3.3.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"

diff --git a/sys-devel/bison/bison-3.4.1.ebuild 
b/sys-devel/bison/bison-3.4.1.ebuild
index db1dd26f896..404b47906d0 100644
--- a/sys-devel/bison/bison-3.4.1.ebuild
+++ b/sys-devel/bison/bison-3.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"

diff --git a/sys-devel/bison/bison-3.4.2.ebuild 
b/sys-devel/bison/bison-3.4.2.ebuild
index 84404d7431d..c09c53ba4c2 100644
--- a/sys-devel/bison/bison-3.4.2.ebuild
+++ b/sys-devel/bison/bison-3.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="examples nls static test"
 
 RDEPEND=">=sys-devel/m4-1.4.16"

diff --git a/sys-devel/clang-common/clang-common-6.0.1.ebuild 
b/sys-devel/clang-common/clang-common-6.0.1.ebuild
index a7ddd072e29..a277aa43d90 100644
--- a/sys-devel/clang-common/clang-common-6.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-6.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"

diff --git a/sys-devel/clang-common/clang-common-7.1.0.ebuild 
b/sys-devel/clang-common/clang-common-7.1.0.ebuild
index d3a52b4c499..7dacf6f897f 100644
--- a/sys-devel/clang-common/clang-common-7.1.0.ebuild
+++ b/sys-devel/clang-common/clang-common-7.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"

diff --git a/sys-devel/clang-common/clang-common-8.0.0.ebuild 
b/sys-devel/clang-common/clang-common-8.0.0.ebuild
index 75b0a841d99..63b4530f623 100644
--- a/sys-devel/clang-common/clang-common-8.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-8.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"

diff --git a/sys-devel/clang-common/clang-common-8.0.1.ebuild 
b/sys-devel/clang-common/clang-common-8.0.1.ebuild
index defe5a818bb..7479a43e529 100644
--- a/sys-devel/clang-common/clang-common-8.0.1.ebuild
+++ b/sys-devel/clang-common/clang-common-8.0.1.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"

diff --git a/sys-devel/clang-common/clang-common-9.0.0.ebuild 
b/sys-devel/clang-common/clang-common-9.0.0.ebuild
index 2ac7ea5c35f..609bdcde4cc 100644
--- a/sys-devel/clang-common/clang-common-9.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-9.0.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"

diff --git a/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild 
b/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild
index 8dac1211a83..3379d57d956 100644
--- a/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-6.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="

diff --git a/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild 
b/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild
index 4a662b30d9c..9e6312c5587 100644
--- a/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-7.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="

diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild 
b/sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild
index 97c0d55cf2a..27853e58d40 100644
--- a/sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-8.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="

diff --git a/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild 
b/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
index d77137643f4..3b325d68acb 100644
--- a/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="${PV%_*}"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="+compiler-rt crt libcxx openmp +sanitize"
 
 RDEPEND="

diff --git a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild 
b/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild
index ebd4556635e..6250baa76c9 100644
--- a/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-9.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 

diff --git a/sys-devel/clang/clang-6.0.1.ebuild 
b/sys-devel/clang/clang-6.0.1.ebuild
index 1fc78008da8..32c29fff257 100644
--- a/sys-devel/clang/clang-6.0.1.ebuild
+++ b/sys-devel/clang/clang-6.0.1.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
        test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/clang/clang-7.1.0.ebuild 
b/sys-devel/clang/clang-7.1.0.ebuild
index 53f44663c4b..acd373adf62 100644
--- a/sys-devel/clang/clang-7.1.0.ebuild
+++ b/sys-devel/clang/clang-7.1.0.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
        test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/clang/clang-8.0.0.ebuild 
b/sys-devel/clang/clang-8.0.0.ebuild
index b06ed7f3a68..5eef36b13cf 100644
--- a/sys-devel/clang/clang-8.0.0.ebuild
+++ b/sys-devel/clang/clang-8.0.0.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
        test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/clang/clang-8.0.1.ebuild 
b/sys-devel/clang/clang-8.0.1.ebuild
index 3dbe5eb763a..63ed45a9fbb 100644
--- a/sys-devel/clang/clang-8.0.1.ebuild
+++ b/sys-devel/clang/clang-8.0.1.ebuild
@@ -31,7 +31,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
        test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/clang/clang-9.0.0.ebuild 
b/sys-devel/clang/clang-9.0.0.ebuild
index 43b4cf171f1..2eabbee087c 100644
--- a/sys-devel/clang/clang-9.0.0.ebuild
+++ b/sys-devel/clang/clang-9.0.0.ebuild
@@ -35,7 +35,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
        test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}

diff --git a/sys-devel/crossdev/crossdev-20181020.ebuild 
b/sys-devel/crossdev/crossdev-20181020.ebuild
index 86917ed0f59..e97cebce0df 100644
--- a/sys-devel/crossdev/crossdev-20181020.ebuild
+++ b/sys-devel/crossdev/crossdev-20181020.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86 ~x86-fbsd"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"

diff --git a/sys-devel/crossdev/crossdev-20181202.ebuild 
b/sys-devel/crossdev/crossdev-20181202.ebuild
index 86917ed0f59..e97cebce0df 100644
--- a/sys-devel/crossdev/crossdev-20181202.ebuild
+++ b/sys-devel/crossdev/crossdev-20181202.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86 ~x86-fbsd"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"

diff --git a/sys-devel/crossdev/crossdev-20190311.ebuild 
b/sys-devel/crossdev/crossdev-20190311.ebuild
index 36e054f04b2..ad51f67caf6 100644
--- a/sys-devel/crossdev/crossdev-20190311.ebuild
+++ b/sys-devel/crossdev/crossdev-20190311.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"

diff --git a/sys-devel/crossdev/crossdev-20190712.ebuild 
b/sys-devel/crossdev/crossdev-20190712.ebuild
index 81c40d108da..5925a249847 100644
--- a/sys-devel/crossdev/crossdev-20190712.ebuild
+++ b/sys-devel/crossdev/crossdev-20190712.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~x86-fbsd"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"

diff --git a/sys-devel/crossdev/crossdev-20190901.ebuild 
b/sys-devel/crossdev/crossdev-20190901.ebuild
index 36e054f04b2..ad51f67caf6 100644
--- a/sys-devel/crossdev/crossdev-20190901.ebuild
+++ b/sys-devel/crossdev/crossdev-20190901.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"

diff --git a/sys-devel/crossdev/crossdev-20190908.ebuild 
b/sys-devel/crossdev/crossdev-20190908.ebuild
index 36e054f04b2..ad51f67caf6 100644
--- a/sys-devel/crossdev/crossdev-20190908.ebuild
+++ b/sys-devel/crossdev/crossdev-20190908.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"

diff --git a/sys-devel/crossdev/crossdev-99999999.ebuild 
b/sys-devel/crossdev/crossdev-99999999.ebuild
index 88ffc0b90b9..b36661fb51a 100644
--- a/sys-devel/crossdev/crossdev-99999999.ebuild
+++ b/sys-devel/crossdev/crossdev-99999999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Gentoo Cross-toolchain generator"

diff --git a/sys-devel/flex/flex-2.6.1.ebuild b/sys-devel/flex/flex-2.6.1.ebuild
index 2e215d2cec5..ea2654c2a94 100644
--- a/sys-devel/flex/flex-2.6.1.ebuild
+++ b/sys-devel/flex/flex-2.6.1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/westes/flex/releases/download/v${PV}/${P}.tar.xz";
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

diff --git a/sys-devel/flex/flex-2.6.3-r1.ebuild 
b/sys-devel/flex/flex-2.6.3-r1.ebuild
index 0388ee0732d..fc2f132f848 100644
--- a/sys-devel/flex/flex-2.6.3-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.3-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 LICENSE="FLEX"
 SLOT="0"
-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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

diff --git a/sys-devel/flex/flex-2.6.3.ebuild b/sys-devel/flex/flex-2.6.3.ebuild
index ac7909b9ac9..97a289f1780 100644
--- a/sys-devel/flex/flex-2.6.3.ebuild
+++ b/sys-devel/flex/flex-2.6.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 LICENSE="FLEX"
 SLOT="0"
-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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

diff --git a/sys-devel/flex/flex-2.6.4-r1.ebuild 
b/sys-devel/flex/flex-2.6.4-r1.ebuild
index b38ee30c32d..caa31dc2a83 100644
--- a/sys-devel/flex/flex-2.6.4-r1.ebuild
+++ b/sys-devel/flex/flex-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

diff --git a/sys-devel/flex/flex-2.6.4.ebuild b/sys-devel/flex/flex-2.6.4.ebuild
index 10a615880b6..04b4927aad5 100644
--- a/sys-devel/flex/flex-2.6.4.ebuild
+++ b/sys-devel/flex/flex-2.6.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/westes/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 LICENSE="FLEX"
 SLOT="0"
-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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static test"
 
 # We want bison explicitly and not yacc in general #381273

diff --git a/sys-devel/gcc-config/gcc-config-2.0.ebuild 
b/sys-devel/gcc-config/gcc-config-2.0.ebuild
index 2b2bd5117da..3e0098e7f4d 100644
--- a/sys-devel/gcc-config/gcc-config-2.0.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"

diff --git a/sys-devel/gcc-config/gcc-config-2.1.ebuild 
b/sys-devel/gcc-config/gcc-config-2.1.ebuild
index fc7dbbda8a1..d63b5087484 100644
--- a/sys-devel/gcc-config/gcc-config-2.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"

diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild 
b/sys-devel/gcc-config/gcc-config-9999.ebuild
index 22370b52cc5..f79e8cf5bc7 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
        SRC_URI="mirror://gentoo/${P}.tar.xz
                https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility to manage compilers"

diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild 
b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index ef118a8b013..0389c0bc437 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper

diff --git a/sys-devel/gcc/gcc-3.4.6-r3.ebuild 
b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
index abb03a92318..3a6d9f58e5d 100644
--- a/sys-devel/gcc/gcc-3.4.6-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r3.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper

diff --git a/sys-devel/gcc/gcc-3.4.6-r4.ebuild 
b/sys-devel/gcc/gcc-3.4.6-r4.ebuild
index 97c3f7c2663..691eeea7f8e 100644
--- a/sys-devel/gcc/gcc-3.4.6-r4.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r4.ebuild
@@ -12,7 +12,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # NOTE: we SHOULD be using at least binutils 2.15.90.0.1 everywhere for proper

diff --git a/sys-devel/gcc/gcc-4.1.2-r2.ebuild 
b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
index d85b6868f57..574788a3f09 100644
--- a/sys-devel/gcc/gcc-4.1.2-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2-r2.ebuild
@@ -9,7 +9,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index 1bd5531ab99..fb958bc86e3 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -9,7 +9,7 @@ D_VER="0.24"
 
 inherit eutils toolchain
 
-KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc 
x86 ~x86-fbsd"
+KEYWORDS="-* alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc 
x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild 
b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index 10a790a9fa0..ccad607df6a 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.2.4-r3.ebuild 
b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
index 15529ecc837..03b5c5788ee 100644
--- a/sys-devel/gcc/gcc-4.2.4-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r3.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.3.6-r1.ebuild 
b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
index d483c32ec95..13c159fc06a 100644
--- a/sys-devel/gcc/gcc-4.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm -hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.3.6-r3.ebuild 
b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
index 637aa208400..f160e48e504 100644
--- a/sys-devel/gcc/gcc-4.3.6-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.3.6-r3.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.4.7-r2.ebuild 
b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
index 7fde120f47b..5f7a73a76be 100644
--- a/sys-devel/gcc/gcc-4.4.7-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7-r2.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.4.7.ebuild b/sys-devel/gcc/gcc-4.4.7.ebuild
index 694e5426d2c..34640172a98 100644
--- a/sys-devel/gcc/gcc-4.4.7.ebuild
+++ b/sys-devel/gcc/gcc-4.4.7.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.5.4-r2.ebuild 
b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
index 1102974a840..3eda7487fbf 100644
--- a/sys-devel/gcc/gcc-4.5.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4-r2.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.5.4.ebuild b/sys-devel/gcc/gcc-4.5.4.ebuild
index f013c619a99..0735102e924 100644
--- a/sys-devel/gcc/gcc-4.5.4.ebuild
+++ b/sys-devel/gcc/gcc-4.5.4.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.6.4-r2.ebuild 
b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
index 99f7924a0ce..ade4c68df1f 100644
--- a/sys-devel/gcc/gcc-4.6.4-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4-r2.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.6.4.ebuild b/sys-devel/gcc/gcc-4.6.4.ebuild
index a3b35cd898a..47155da6260 100644
--- a/sys-devel/gcc/gcc-4.6.4.ebuild
+++ b/sys-devel/gcc/gcc-4.6.4.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.8.5-r1.ebuild 
b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
index 547dea86f3a..bd652d8ed76 100644
--- a/sys-devel/gcc/gcc-4.8.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r1.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.8.5-r3.ebuild 
b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
index 006faad08fa..4c11d5d3918 100644
--- a/sys-devel/gcc/gcc-4.8.5-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.8.5-r3.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.9.4-r1.ebuild 
b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
index b935459e81c..a1f1723df03 100644
--- a/sys-devel/gcc/gcc-4.9.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4-r1.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-4.9.4.ebuild b/sys-devel/gcc/gcc-4.9.4.ebuild
index b5030ce317f..5edaa285cb5 100644
--- a/sys-devel/gcc/gcc-4.9.4.ebuild
+++ b/sys-devel/gcc/gcc-4.9.4.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit eutils toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-5.4.0-r4.ebuild 
b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
index 181c11eabbb..cd5748b36ff 100644
--- a/sys-devel/gcc/gcc-5.4.0-r4.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r4.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-5.4.0-r6.ebuild 
b/sys-devel/gcc/gcc-5.4.0-r6.ebuild
index 1c5a20716c1..e95e159b442 100644
--- a/sys-devel/gcc/gcc-5.4.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-5.4.0-r6.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-5.5.0.ebuild b/sys-devel/gcc/gcc-5.5.0.ebuild
index ac8d9c9e40b..629e831d74a 100644
--- a/sys-devel/gcc/gcc-5.5.0.ebuild
+++ b/sys-devel/gcc/gcc-5.5.0.ebuild
@@ -21,7 +21,7 @@ SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-6.4.0-r1.ebuild 
b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
index 927fe13ced5..a662ae79354 100644
--- a/sys-devel/gcc/gcc-6.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r1.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-6.4.0-r5.ebuild 
b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
index 8f8f11741c1..138098ca567 100644
--- a/sys-devel/gcc/gcc-6.4.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-6.4.0-r5.ebuild
@@ -8,7 +8,7 @@ UCLIBC_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild 
b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index c54427945bb..0a8f58febc8 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 
sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild 
b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
index 0cb2bde8a3c..24887e44d2b 100644
--- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.4"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-7.3.0-r6.ebuild 
b/sys-devel/gcc/gcc-7.3.0-r6.ebuild
index 9a748f4aa6b..b1d74320f93 100644
--- a/sys-devel/gcc/gcc-7.3.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r6.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.8"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-7.4.0-r1.ebuild 
b/sys-devel/gcc/gcc-7.4.0-r1.ebuild
index 76bd028c8fe..bd17a751b0d 100644
--- a/sys-devel/gcc/gcc-7.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild 
b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
index 0efb888b874..62cdb74d516 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 
sparc x86 ~ppc-macos"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-8.2.0-r5.ebuild 
b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
index 602acddf560..73a14f4d9f6 100644
--- a/sys-devel/gcc/gcc-8.2.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r5.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.6"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-8.2.0-r6.ebuild 
b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
index 08707ae05af..0fdec953b41 100644
--- a/sys-devel/gcc/gcc-8.2.0-r6.ebuild
+++ b/sys-devel/gcc/gcc-8.2.0-r6.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.7"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-8.3.0-r1.ebuild 
b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
index eb795f49ca9..bd9df9561f8 100644
--- a/sys-devel/gcc/gcc-8.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
~sh sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-8.3.0-r2.ebuild 
b/sys-devel/gcc/gcc-8.3.0-r2.ebuild
index 987d7f12865..c30baaab62a 100644
--- a/sys-devel/gcc/gcc-8.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0-r2.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-8.3.0.ebuild b/sys-devel/gcc/gcc-8.3.0.ebuild
index e7fa7284e87..15779b5b4bc 100644
--- a/sys-devel/gcc/gcc-8.3.0.ebuild
+++ b/sys-devel/gcc/gcc-8.3.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-9.1.0-r1.ebuild 
b/sys-devel/gcc/gcc-9.1.0-r1.ebuild
index 73c93d32ff1..ac9e761fd5a 100644
--- a/sys-devel/gcc/gcc-9.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.1.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-9.1.0.ebuild b/sys-devel/gcc/gcc-9.1.0.ebuild
index 16bdf7beda9..3aeba122c2a 100644
--- a/sys-devel/gcc/gcc-9.1.0.ebuild
+++ b/sys-devel/gcc/gcc-9.1.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-9.2.0-r1.ebuild 
b/sys-devel/gcc/gcc-9.2.0-r1.ebuild
index 29311a0ae4c..112f62afbb3 100644
--- a/sys-devel/gcc/gcc-9.2.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gcc/gcc-9.2.0.ebuild b/sys-devel/gcc/gcc-9.2.0.ebuild
index 585bf05e13a..6e7404c49e5 100644
--- a/sys-devel/gcc/gcc-9.2.0.ebuild
+++ b/sys-devel/gcc/gcc-9.2.0.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="1"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}

diff --git a/sys-devel/gdb/gdb-8.3.1.ebuild b/sys-devel/gdb/gdb-8.3.1.ebuild
index 41c20dc863f..feca5f54191 100644
--- a/sys-devel/gdb/gdb-8.3.1.ebuild
+++ b/sys-devel/gdb/gdb-8.3.1.ebuild
@@ -46,7 +46,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test 
vanilla xml"
 REQUIRED_USE="

diff --git a/sys-devel/gdb/gdb-8.3.ebuild b/sys-devel/gdb/gdb-8.3.ebuild
index c544de00637..f0c620ed6cb 100644
--- a/sys-devel/gdb/gdb-8.3.ebuild
+++ b/sys-devel/gdb/gdb-8.3.ebuild
@@ -46,7 +46,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test 
vanilla xml"
 REQUIRED_USE="

diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 41c20dc863f..feca5f54191 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -46,7 +46,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test 
vanilla xml"
 REQUIRED_USE="

diff --git a/sys-devel/gettext/gettext-0.19.8.1.ebuild 
b/sys-devel/gettext/gettext-0.19.8.1.ebuild
index 11311e92bc8..ca4ca35f618 100644
--- a/sys-devel/gettext/gettext-0.19.8.1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86"
 IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib

diff --git a/sys-devel/gettext/gettext-0.20.1.ebuild 
b/sys-devel/gettext/gettext-0.20.1.ebuild
index 8cf0b2e8bd2..0bcc7180534 100644
--- a/sys-devel/gettext/gettext-0.20.1.ebuild
+++ b/sys-devel/gettext/gettext-0.20.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 # so put that license behind USE=cxx.
 LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86"
 IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
 
 # only runtime goes multilib

diff --git a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild 
b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
index 0b3c4010d8f..f132f3374af 100644
--- a/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20170101.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
-       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 ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
        S="${WORKDIR}"
 fi
 

diff --git a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild 
b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
index 97da37cf54f..2a59bb6ec8f 100644
--- a/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20180101.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv 
s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
        S="${WORKDIR}"
 fi
 

diff --git a/sys-devel/gnuconfig/gnuconfig-20190804.ebuild 
b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
index c7e0faa0146..0ba18b2c2bd 100644
--- a/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20190804.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt"
        S="${WORKDIR}"
 fi
 

diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild 
b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
index c7e0faa0146..0ba18b2c2bd 100644
--- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gentoo/${P}.tar.bz2"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt"
        S="${WORKDIR}"
 fi
 

diff --git a/sys-devel/libtool/libtool-2.4.6-r3.ebuild 
b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
index 142f81d011b..ea32af369d0 100644
--- a/sys-devel/libtool/libtool-2.4.6-r3.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86 ~amd64-fbsd ~x86-fbsd"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86"
 fi
 
 DESCRIPTION="A shared library tool for developers"

diff --git a/sys-devel/libtool/libtool-2.4.6-r4.ebuild 
b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
index d571f421d72..a7dc840c4d4 100644
--- a/sys-devel/libtool/libtool-2.4.6-r4.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-       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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"

diff --git a/sys-devel/libtool/libtool-2.4.6-r5.ebuild 
b/sys-devel/libtool/libtool-2.4.6-r5.ebuild
index 0831b4f32cf..9f5c38a68cd 100644
--- a/sys-devel/libtool/libtool-2.4.6-r5.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"

diff --git a/sys-devel/libtool/libtool-9999.ebuild 
b/sys-devel/libtool/libtool-9999.ebuild
index 140bf7a5cb4..96ef613ccee 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
        inherit git-r3
 else
        SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-       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 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"

diff --git a/sys-devel/lld/lld-6.0.1.ebuild b/sys-devel/lld/lld-6.0.1.ebuild
index 0117f71487d..e05fe0f7cc6 100644
--- a/sys-devel/lld/lld-6.0.1.ebuild
+++ b/sys-devel/lld/lld-6.0.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/lld/lld-7.1.0.ebuild b/sys-devel/lld/lld-7.1.0.ebuild
index ffb8fff0acd..468b665c1f1 100644
--- a/sys-devel/lld/lld-7.1.0.ebuild
+++ b/sys-devel/lld/lld-7.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/lld/lld-8.0.0.ebuild b/sys-devel/lld/lld-8.0.0.ebuild
index a5009a3a175..118b18415a2 100644
--- a/sys-devel/lld/lld-8.0.0.ebuild
+++ b/sys-devel/lld/lld-8.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/lld/lld-8.0.1.ebuild b/sys-devel/lld/lld-8.0.1.ebuild
index a5e2b13429b..5c66287966a 100644
--- a/sys-devel/lld/lld-8.0.1.ebuild
+++ b/sys-devel/lld/lld-8.0.1.ebuild
@@ -20,7 +20,7 @@ 
SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/lld/lld-9.0.0.ebuild b/sys-devel/lld/lld-9.0.0.ebuild
index 224aa164a91..c938e81bb90 100644
--- a/sys-devel/lld/lld-9.0.0.ebuild
+++ b/sys-devel/lld/lld-9.0.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

diff --git a/sys-devel/llvm-common/llvm-common-6.0.1.ebuild 
b/sys-devel/llvm-common/llvm-common-6.0.1.ebuild
index e9677df471a..5f3bbef8c0b 100644
--- a/sys-devel/llvm-common/llvm-common-6.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-6.0.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"

diff --git a/sys-devel/llvm-common/llvm-common-7.1.0.ebuild 
b/sys-devel/llvm-common/llvm-common-7.1.0.ebuild
index 236d69e84a2..a7ec5caa308 100644
--- a/sys-devel/llvm-common/llvm-common-7.1.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-7.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"

diff --git a/sys-devel/llvm-common/llvm-common-8.0.0.ebuild 
b/sys-devel/llvm-common/llvm-common-8.0.0.ebuild
index 5d3f8596005..f14d71fb98e 100644
--- a/sys-devel/llvm-common/llvm-common-8.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-8.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz";
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"

diff --git a/sys-devel/llvm-common/llvm-common-8.0.1.ebuild 
b/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
index 0691e0161e5..f15962d7be2 100644
--- a/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
+++ b/sys-devel/llvm-common/llvm-common-8.0.1.ebuild
@@ -10,7 +10,7 @@ 
SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"

diff --git a/sys-devel/llvm-common/llvm-common-9.0.0.ebuild 
b/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
index 853c60a6914..65eb4d232e3 100644
--- a/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-9.0.0.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"

diff --git a/sys-devel/llvm/llvm-6.0.1-r2.ebuild 
b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
index 45ab641dc66..01164ba7d20 100644
--- a/sys-devel/llvm/llvm-6.0.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1-r2.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
        llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test xar xml
        kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/llvm/llvm-6.0.1.ebuild b/sys-devel/llvm/llvm-6.0.1.ebuild
index 395441ba7a4..ddb059014c5 100644
--- a/sys-devel/llvm/llvm-6.0.1.ebuild
+++ b/sys-devel/llvm/llvm-6.0.1.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
        llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug doc gold libedit +libffi ncurses test xar xml
        kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/llvm/llvm-7.1.0.ebuild b/sys-devel/llvm/llvm-7.1.0.ebuild
index e785407ad28..b6ac1a5fb26 100644
--- a/sys-devel/llvm/llvm-7.1.0.ebuild
+++ b/sys-devel/llvm/llvm-7.1.0.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
        llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
        kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/llvm/llvm-8.0.0.ebuild b/sys-devel/llvm/llvm-8.0.0.ebuild
index 598c0b67919..da29ab61010 100644
--- a/sys-devel/llvm/llvm-8.0.0.ebuild
+++ b/sys-devel/llvm/llvm-8.0.0.ebuild
@@ -32,7 +32,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
        llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
        kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/llvm/llvm-8.0.1.ebuild b/sys-devel/llvm/llvm-8.0.1.ebuild
index cc7266ad8ff..9a04aa34bb2 100644
--- a/sys-devel/llvm/llvm-8.0.1.ebuild
+++ b/sys-devel/llvm/llvm-8.0.1.ebuild
@@ -33,7 +33,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 LICENSE="UoI-NCSA rc BSD public-domain
        llvm_targets_ARM? ( LLVM-Grant )"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml
        kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 RESTRICT="!test? ( test )"

diff --git a/sys-devel/llvm/llvm-9.0.0.ebuild b/sys-devel/llvm/llvm-9.0.0.ebuild
index 8cd42b405cc..62d66ff6800 100644
--- a/sys-devel/llvm/llvm-9.0.0.ebuild
+++ b/sys-devel/llvm/llvm-9.0.0.ebuild
@@ -31,7 +31,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos 
~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos 
~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
        kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"

diff --git a/sys-devel/m4/m4-1.4.17.ebuild b/sys-devel/m4/m4-1.4.17.ebuild
index 19347f7bc17..bdd11320b63 100644
--- a/sys-devel/m4/m4-1.4.17.ebuild
+++ b/sys-devel/m4/m4-1.4.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us

diff --git a/sys-devel/m4/m4-1.4.18-r1.ebuild b/sys-devel/m4/m4-1.4.18-r1.ebuild
index 52086c40c4a..a561d7b30a8 100644
--- a/sys-devel/m4/m4-1.4.18-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.18-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
 # remember: cannot dep on autoconf since it needs us

diff --git a/sys-devel/make/make-4.2.1-r4.ebuild 
b/sys-devel/make/make-4.2.1-r4.ebuild
index e6baaf88f00..970ce1a358d 100644
--- a/sys-devel/make/make-4.2.1-r4.ebuild
+++ b/sys-devel/make/make-4.2.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu//make/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="guile nls static"
 
 CDEPEND="guile? ( >=dev-scheme/guile-1.8:= )"

diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild 
b/sys-devel/patch/patch-2.7.6-r4.ebuild
index b480b40246e..1fbe08e714b 100644
--- a/sys-devel/patch/patch-2.7.6-r4.ebuild
+++ b/sys-devel/patch/patch-2.7.6-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static test xattr"
 
 RDEPEND="xattr? ( sys-apps/attr )"

diff --git a/sys-devel/qconf/qconf-2.3.ebuild b/sys-devel/qconf/qconf-2.3.ebuild
index 40ddf2a3217..4292f0c9508 100644
--- a/sys-devel/qconf/qconf-2.3.ebuild
+++ b/sys-devel/qconf/qconf-2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 # There is no one to one match to autotools-based configure

diff --git a/sys-devel/qconf/qconf-2.4.ebuild b/sys-devel/qconf/qconf-2.4.ebuild
index 8dd2ae4e518..ba6e9b593c2 100644
--- a/sys-devel/qconf/qconf-2.4.ebuild
+++ b/sys-devel/qconf/qconf-2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://psi-im.org/files/qconf/${P}.tar.xz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="