*/*: remove x86-solaris keyword

Signed-off-by: Fabian Groffen <grobian@gentoo.org>

55 files changed, 55 insertions, 55 deletions

diff --git a/dev-util/b2/b2-4.9.6.ebuild b/dev-util/b2/b2-4.9.6.ebuild
index b7e29d43288c..90c7beef0f98 100644
--- a/dev-util/b2/b2-4.9.6.ebuild
+++ b/dev-util/b2/b2-4.9.6.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/byacc/byacc-20221229.ebuild b/dev-util/byacc/byacc-20221229.ebuild
index c742cb13b523..667c37d6ee3d 100644
--- a/dev-util/byacc/byacc-20221229.ebuild
+++ b/dev-util/byacc/byacc-20221229.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/byacc/byacc-20230201.ebuild b/dev-util/byacc/byacc-20230201.ebuild
index c742cb13b523..667c37d6ee3d 100644
--- a/dev-util/byacc/byacc-20230201.ebuild
+++ b/dev-util/byacc/byacc-20230201.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/byacc/byacc-20230219.ebuild b/dev-util/byacc/byacc-20230219.ebuild
index c742cb13b523..667c37d6ee3d 100644
--- a/dev-util/byacc/byacc-20230219.ebuild
+++ b/dev-util/byacc/byacc-20230219.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/byacc/byacc-20230521.ebuild b/dev-util/byacc/byacc-20230521.ebuild
index 71ee96f9567f..d18bfc3a9b3d 100644
--- a/dev-util/byacc/byacc-20230521.ebuild
+++ b/dev-util/byacc/byacc-20230521.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/cmake/cmake-3.24.3.ebuild b/dev-util/cmake/cmake-3.24.3.ebuild
index 835f3a198d1d..0551b0afad50 100644
--- a/dev-util/cmake/cmake-3.24.3.ebuild
+++ b/dev-util/cmake/cmake-3.24.3.ebuild
@@ -47,7 +47,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/cmake/cmake-3.25.3.ebuild b/dev-util/cmake/cmake-3.25.3.ebuild
index 35212b661e4e..e3bd33f27ca7 100644
--- a/dev-util/cmake/cmake-3.25.3.ebuild
+++ b/dev-util/cmake/cmake-3.25.3.ebuild
@@ -47,7 +47,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/cmake/cmake-3.26.3.ebuild b/dev-util/cmake/cmake-3.26.3.ebuild
index da765ef9cb9f..061d755ddde0 100644
--- a/dev-util/cmake/cmake-3.26.3.ebuild
+++ b/dev-util/cmake/cmake-3.26.3.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/cmake/cmake-3.26.4-r1.ebuild b/dev-util/cmake/cmake-3.26.4-r1.ebuild
index a2b661bbcdbe..f35850d4386d 100644
--- a/dev-util/cmake/cmake-3.26.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.26.4-r1.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index a2b661bbcdbe..f35850d4386d 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -48,7 +48,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/colm/colm-0.14.7-r1.ebuild b/dev-util/colm/colm-0.14.7-r1.ebuild
index 147625389f13..42a7d6592ed4 100644
--- a/dev-util/colm/colm-0.14.7-r1.ebuild
+++ b/dev-util/colm/colm-0.14.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-util/colm/colm-0.14.7-r2.ebuild b/dev-util/colm/colm-0.14.7-r2.ebuild
index b193e30a6003..43483d646425 100644
--- a/dev-util/colm/colm-0.14.7-r2.ebuild
+++ b/dev-util/colm/colm-0.14.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-util/colm/colm-0.14.7-r3.ebuild b/dev-util/colm/colm-0.14.7-r3.ebuild
index 19e1284d28ca..2e4003921470 100644
--- a/dev-util/colm/colm-0.14.7-r3.ebuild
+++ b/dev-util/colm/colm-0.14.7-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index 774e9dd3a369..f855ac33e94a 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 BDEPEND="
diff --git a/dev-util/cscope/cscope-15.9-r1.ebuild b/dev-util/cscope/cscope-15.9-r1.ebuild
index bf23e6c4ee32..e71ab02660f5 100644
--- a/dev-util/cscope/cscope-15.9-r1.ebuild
+++ b/dev-util/cscope/cscope-15.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/cscope/cscope-15.9.ebuild b/dev-util/cscope/cscope-15.9.ebuild
index 4762c7013f81..93e5f73530b9 100644
--- a/dev-util/cscope/cscope-15.9.ebuild
+++ b/dev-util/cscope/cscope-15.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
 IUSE="emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.2:0=
diff --git a/dev-util/ctags/ctags-20211017.0.ebuild b/dev-util/ctags/ctags-20211017.0.ebuild
index c640b8a9d796..5d0dcc6a745d 100644
--- a/dev-util/ctags/ctags-20211017.0.ebuild
+++ b/dev-util/ctags/ctags-20211017.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *99999999* ]] ; then
 else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-p5.9.${PV}"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/ctags/ctags-20220828.0-r1.ebuild b/dev-util/ctags/ctags-20220828.0-r1.ebuild
index 5859ad5945c5..aaadb991f70d 100644
--- a/dev-util/ctags/ctags-20220828.0-r1.ebuild
+++ b/dev-util/ctags/ctags-20220828.0-r1.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-p5.9.${PV}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/ctags/ctags-20230423.0.ebuild b/dev-util/ctags/ctags-20230423.0.ebuild
index afd8d7dfd353..7c5e358c1737 100644
--- a/dev-util/ctags/ctags-20230423.0.ebuild
+++ b/dev-util/ctags/ctags-20230423.0.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-p6.0.${PV}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index afd8d7dfd353..7c5e358c1737 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -16,7 +16,7 @@ else
 	SRC_URI="https://github.com/universal-ctags/ctags/archive/refs/tags/p6.0.${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-p6.0.${PV}
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 fi
 
 LICENSE="GPL-2+"
diff --git a/dev-util/dejagnu/dejagnu-1.6.3.ebuild b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
index 62413d665908..fbfbe620f74f 100644
--- a/dev-util/dejagnu/dejagnu-1.6.3.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
index 2cce1246a33e..ce599062145b 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild
index 341610f8b3f2..f0b157715885 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.26-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2"
diff --git a/dev-util/diffstat/diffstat-1.65.ebuild b/dev-util/diffstat/diffstat-1.65.ebuild
index 73bea9ee1757..5aaac1b13057 100644
--- a/dev-util/diffstat/diffstat-1.65.ebuild
+++ b/dev-util/diffstat/diffstat-1.65.ebuild
@@ -13,6 +13,6 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
diff --git a/dev-util/flawfinder/flawfinder-2.0.19.ebuild b/dev-util/flawfinder/flawfinder-2.0.19.ebuild
index b25600f94f8e..2e6ae0f88331 100644
--- a/dev-util/flawfinder/flawfinder-2.0.19.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.0.18-setup.patch )
 
diff --git a/dev-util/glib-utils/glib-utils-2.76.2.ebuild b/dev-util/glib-utils/glib-utils-2.76.2.ebuild
index d94a24e0b19e..db5a6526acd6 100644
--- a/dev-util/glib-utils/glib-utils-2.76.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.76.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/glib-utils-2.76.3.ebuild b/dev-util/glib-utils/glib-utils-2.76.3.ebuild
index 33bfee268b48..d09b4412f38d 100644
--- a/dev-util/glib-utils/glib-utils-2.76.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.76.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gperf/gperf-3.1-r1.ebuild b/dev-util/gperf/gperf-3.1-r1.ebuild
index ab2b4430c847..056ce825e968 100644
--- a/dev-util/gperf/gperf-3.1-r1.ebuild
+++ b/dev-util/gperf/gperf-3.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-winnt"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-strncmp-decl-mismatch.patch
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 6825ce198e6b..963f59256614 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-winnt"
 
 src_prepare() {
 	sed -i \
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
index 9b4c86cae064..29aa342db44c 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.33.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild b/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
index 64b206633f1a..215623e9df3b 100644
--- a/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
+++ b/dev-util/gtk-doc-am/gtk-doc-am-1.33.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/DocumentationProject/GtkDoc"
 
 LICENSE="GPL-2 FDL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="!<dev-util/gtk-doc-${PV}"
 PDEPEND="virtual/pkgconfig"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.31.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.31.ebuild
index a5d90ea21776..18674dbfa5c7 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.31.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.31.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.ta
 LICENSE="LGPL-2.1+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/indent/indent-2.2.12.ebuild b/dev-util/indent/indent-2.2.12.ebuild
index 07e8341f0b32..819a285945e8 100644
--- a/dev-util/indent/indent-2.2.12.ebuild
+++ b/dev-util/indent/indent-2.2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="nls"
 
 BDEPEND="app-text/texi2html
diff --git a/dev-util/indent/indent-2.2.13.ebuild b/dev-util/indent/indent-2.2.13.ebuild
index 91f6f15810a8..224f58911fe2 100644
--- a/dev-util/indent/indent-2.2.13.ebuild
+++ b/dev-util/indent/indent-2.2.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="nls"
 
 BDEPEND="
diff --git a/dev-util/intltool/intltool-0.51.0-r3.ebuild b/dev-util/intltool/intltool-0.51.0-r3.ebuild
index ee4a1f12a047..6bd92c1d6365 100644
--- a/dev-util/intltool/intltool-0.51.0-r3.ebuild
+++ b/dev-util/intltool/intltool-0.51.0-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-util/itstool/itstool-2.0.7.ebuild b/dev-util/itstool/itstool-2.0.7.ebuild
index ac888b21cab1..02b73121924e 100644
--- a/dev-util/itstool/itstool-2.0.7.ebuild
+++ b/dev-util/itstool/itstool-2.0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/meson-format-array/meson-format-array-0.ebuild b/dev-util/meson-format-array/meson-format-array-0.ebuild
index a7994c74dab5..ff9abc0c599d 100644
--- a/dev-util/meson-format-array/meson-format-array-0.ebuild
+++ b/dev-util/meson-format-array/meson-format-array-0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/meson/meson-1.0.1.ebuild b/dev-util/meson/meson-1.0.1.ebuild
index d85cf742ad02..74e19a88cb2c 100644
--- a/dev-util/meson/meson-1.0.1.ebuild
+++ b/dev-util/meson/meson-1.0.1.ebuild
@@ -16,7 +16,7 @@ else
 	S=${WORKDIR}/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-util/meson/meson-1.1.0.ebuild b/dev-util/meson/meson-1.1.0.ebuild
index 85ac9b28d61b..6baee0a8b852 100644
--- a/dev-util/meson/meson-1.1.0.ebuild
+++ b/dev-util/meson/meson-1.1.0.ebuild
@@ -16,7 +16,7 @@ else
 	S=${WORKDIR}/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 85ac9b28d61b..6baee0a8b852 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -16,7 +16,7 @@ else
 	S=${WORKDIR}/${MY_P}
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 	fi
 fi
 
diff --git a/dev-util/ninja/ninja-1.11.1-r2.ebuild b/dev-util/ninja/ninja-1.11.1-r2.ebuild
index 0ec62c24b91d..065ac0ab670b 100644
--- a/dev-util/ninja/ninja-1.11.1-r2.ebuild
+++ b/dev-util/ninja/ninja-1.11.1-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index ce997aee02dd..2d924c46a5db 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/patchutils/patchutils-0.4.2.ebuild b/dev-util/patchutils/patchutils-0.4.2.ebuild
index b141c55c7f4c..a9577dbee2c4 100644
--- a/dev-util/patchutils/patchutils-0.4.2.ebuild
+++ b/dev-util/patchutils/patchutils-0.4.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="pcre"
 
 RDEPEND="pcre? ( dev-libs/libpcre2:= )"
diff --git a/dev-util/pkgconf/pkgconf-1.8.1.ebuild b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
index 45bdb62e1692..8185a974c854 100644
--- a/dev-util/pkgconf/pkgconf-1.8.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://gitea.treehouse.systems/ariadne/pkgconf.git"
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than C99"
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 35024fdab4f8..58f7ab957426 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 # We need to get the txl language in Portage to have the tests :(
 RESTRICT="test"
diff --git a/dev-util/ragel/ragel-7.0.4-r2.ebuild b/dev-util/ragel/ragel-7.0.4-r2.ebuild
index 81f10afdfff0..1093d7132b74 100644
--- a/dev-util/ragel/ragel-7.0.4-r2.ebuild
+++ b/dev-util/ragel/ragel-7.0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 # Notes from bug #766090
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index 79d4602d7174..e5e78b8191c0 100644
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc"
 
 # Notes from bug #766090
diff --git a/dev-util/re2c/re2c-2.1.1-r1.ebuild b/dev-util/re2c/re2c-2.1.1-r1.ebuild
index 9ef9ff4133eb..a1a8ec8bb955 100644
--- a/dev-util/re2c/re2c-2.1.1-r1.ebuild
+++ b/dev-util/re2c/re2c-2.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="debug"
 
 PATCHES=("${FILESDIR}"/${P}-sh.patch)
diff --git a/dev-util/re2c/re2c-2.2.ebuild b/dev-util/re2c/re2c-2.2.ebuild
index e0e45d5d87d0..e40f9286e79a 100644
--- a/dev-util/re2c/re2c-2.2.ebuild
+++ b/dev-util/re2c/re2c-2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="debug test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-util/scons/scons-4.4.0-r1.ebuild b/dev-util/scons/scons-4.4.0-r1.ebuild
index b5cb85dfa845..8981ef9ef609 100644
--- a/dev-util/scons/scons-4.4.0-r1.ebuild
+++ b/dev-util/scons/scons-4.4.0-r1.ebuild
@@ -33,7 +33,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/scons-4.4.0.ebuild b/dev-util/scons/scons-4.4.0.ebuild
index 4ea7137b1c62..0941c722da38 100644
--- a/dev-util/scons/scons-4.4.0.ebuild
+++ b/dev-util/scons/scons-4.4.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/scons-4.5.1-r2.ebuild b/dev-util/scons/scons-4.5.1-r2.ebuild
index 4a27c925f5c4..291380b2d0e9 100644
--- a/dev-util/scons/scons-4.5.1-r2.ebuild
+++ b/dev-util/scons/scons-4.5.1-r2.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/scons/scons-4.5.2.ebuild b/dev-util/scons/scons-4.5.2.ebuild
index a266b560941a..666ee54c5288 100644
--- a/dev-util/scons/scons-4.5.2.ebuild
+++ b/dev-util/scons/scons-4.5.2.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/uncrustify/uncrustify-0.76.0.ebuild b/dev-util/uncrustify/uncrustify-0.76.0.ebuild
index d6a93ff17ce0..d2cb359fd749 100644
--- a/dev-util/uncrustify/uncrustify-0.76.0.ebuild
+++ b/dev-util/uncrustify/uncrustify-0.76.0.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	scm_eclass=git-r3
 else
-	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${P}
 fi
diff --git a/dev-util/uncrustify/uncrustify-9999.ebuild b/dev-util/uncrustify/uncrustify-9999.ebuild
index a385690fe6b7..01cb78302eb6 100644
--- a/dev-util/uncrustify/uncrustify-9999.ebuild
+++ b/dev-util/uncrustify/uncrustify-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	scm_eclass=git-r3
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
 	S=${WORKDIR}/${PN}-${P}
 fi